diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-12-12 14:40:29 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-12 14:40:29 -0500 |
| commit | e2a6cde4f4e7d4a003950afc388f2cb60414c775 (patch) | |
| tree | 7d2987a0d340b8f7f1feb17f15278fc5de8cb9be /playbooks/common/openshift-cluster/upgrades/pre/tasks/verify_docker_upgrade_targets.yml | |
| parent | 549bd2c81da98333e229f8afb467aa909917a8a4 (diff) | |
| parent | e1df3b6ba7b78255c8022468e9ad1a32255e5e59 (diff) | |
| download | openshift-e2a6cde4f4e7d4a003950afc388f2cb60414c775.tar.gz openshift-e2a6cde4f4e7d4a003950afc388f2cb60414c775.tar.bz2 openshift-e2a6cde4f4e7d4a003950afc388f2cb60414c775.tar.xz openshift-e2a6cde4f4e7d4a003950afc388f2cb60414c775.zip | |
Merge pull request #6407 from mgugino-upstream-stage/crt-upgrades
Refactor upgrade codepaths step 1
Diffstat (limited to 'playbooks/common/openshift-cluster/upgrades/pre/tasks/verify_docker_upgrade_targets.yml')
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/pre/tasks/verify_docker_upgrade_targets.yml | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/pre/tasks/verify_docker_upgrade_targets.yml b/playbooks/common/openshift-cluster/upgrades/pre/tasks/verify_docker_upgrade_targets.yml deleted file mode 100644 index 18a08eb99..000000000 --- a/playbooks/common/openshift-cluster/upgrades/pre/tasks/verify_docker_upgrade_targets.yml +++ /dev/null @@ -1,22 +0,0 @@ ---- -# Only check if docker upgrade is required if docker_upgrade is not -# already set to False. -- include_tasks: ../../docker/upgrade_check.yml - when: - - docker_upgrade is not defined or (docker_upgrade | bool) - - not (openshift.common.is_atomic | bool) - -# Additional checks for Atomic hosts: - -- name: Determine available Docker - shell: "rpm -q --queryformat '---\ncurr_version: %{VERSION}\navail_version: \n' docker" - register: g_atomic_docker_version_result - when: openshift.common.is_atomic | bool - -- set_fact: - l_docker_version: "{{ g_atomic_docker_version_result.stdout | from_yaml }}" - when: openshift.common.is_atomic | bool - -- fail: - msg: This playbook requires access to Docker 1.12 or later - when: openshift.common.is_atomic | bool and l_docker_version.avail_version | default(l_docker_version.curr_version, true) | version_compare('1.12','<') |