summaryrefslogtreecommitdiffstats
path: root/playbooks
diff options
context:
space:
mode:
authorDevan Goodwin <dgoodwin@redhat.com>2016-06-17 15:22:01 -0300
committerDevan Goodwin <dgoodwin@redhat.com>2016-06-17 15:22:01 -0300
commitb377f9d85df11c532281c213eda1869596642204 (patch)
tree106ed170e5e3c5684499b839dda1b6898e2c75b7 /playbooks
parent856175c0a9167d1dba0ac46ec900bda497a8c0a7 (diff)
downloadopenshift-b377f9d85df11c532281c213eda1869596642204.tar.gz
openshift-b377f9d85df11c532281c213eda1869596642204.tar.bz2
openshift-b377f9d85df11c532281c213eda1869596642204.tar.xz
openshift-b377f9d85df11c532281c213eda1869596642204.zip
Block Docker 1.10 upgrade playbook when run against an Atomic OS.
Diffstat (limited to 'playbooks')
-rw-r--r--playbooks/byo/openshift-cluster/upgrades/docker/docker_upgrade.yml9
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