diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-06-24 22:41:07 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-24 22:41:07 -0400 |
| commit | bf520e46e6916a4c9995ea95fa40cdd25f31209e (patch) | |
| tree | a8260747ecc6ecabdc551bc8a1145ab4a15fa82c /playbooks/byo/openshift-cluster | |
| parent | d21c0b0deef39496d07da5a077dfc8ddad4cb4c9 (diff) | |
| parent | b377f9d85df11c532281c213eda1869596642204 (diff) | |
| download | openshift-bf520e46e6916a4c9995ea95fa40cdd25f31209e.tar.gz openshift-bf520e46e6916a4c9995ea95fa40cdd25f31209e.tar.bz2 openshift-bf520e46e6916a4c9995ea95fa40cdd25f31209e.tar.xz openshift-bf520e46e6916a4c9995ea95fa40cdd25f31209e.zip | |
Merge pull request #2061 from dgoodwin/docker-110-atomic
Block Docker 1.10 upgrade playbook when run against an Atomic OS.
Diffstat (limited to 'playbooks/byo/openshift-cluster')
| -rw-r--r-- | playbooks/byo/openshift-cluster/upgrades/docker/docker_upgrade.yml | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/playbooks/byo/openshift-cluster/upgrades/docker/docker_upgrade.yml b/playbooks/byo/openshift-cluster/upgrades/docker/docker_upgrade.yml index 8b1b2fb1b..d7798d304 100644 --- a/playbooks/byo/openshift-cluster/upgrades/docker/docker_upgrade.yml +++ b/playbooks/byo/openshift-cluster/upgrades/docker/docker_upgrade.yml @@ -4,26 +4,27 @@ roles: - openshift_facts tasks: + - fail: + msg: Cannot upgrade Docker on Atomic operating systems. + when: openshift.common.is_atomic | bool + - name: Determine available Docker version script: ../../../../common/openshift-cluster/upgrades/files/rpm_versions.sh docker register: g_docker_version_result - when: not openshift.common.is_atomic | bool - name: Check if Docker is installed command: rpm -q docker register: pkg_check failed_when: pkg_check.rc > 1 changed_when: no - when: not openshift.common.is_atomic | bool - set_fact: g_docker_version: "{{ g_docker_version_result.stdout | from_yaml }}" - when: not openshift.common.is_atomic | bool - name: Set fact if docker requires an upgrade set_fact: docker_upgrade: true - when: not openshift.common.is_atomic | bool and pkg_check.rc == 0 and g_docker_version.curr_version | version_compare('1.10','<') + when: pkg_check.rc == 0 and g_docker_version.curr_version | version_compare('1.10','<') - fail: msg: This playbook requires access to Docker 1.10 or later |