summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDevan Goodwin <dgoodwin@redhat.com>2016-07-19 08:51:14 -0300
committerDevan Goodwin <dgoodwin@redhat.com>2016-07-19 08:51:14 -0300
commit84ef6e3e686ef49eb1521935bb2f4c1b662cfa34 (patch)
tree8e445be43715d305ac65c072f032417ab0cc6930
parentac4ef6bb65c24890592b6b35b11be82f4ddc6deb (diff)
downloadopenshift-84ef6e3e686ef49eb1521935bb2f4c1b662cfa34.tar.gz
openshift-84ef6e3e686ef49eb1521935bb2f4c1b662cfa34.tar.bz2
openshift-84ef6e3e686ef49eb1521935bb2f4c1b662cfa34.tar.xz
openshift-84ef6e3e686ef49eb1521935bb2f4c1b662cfa34.zip
Skip docker upgrades on Atomic.
-rw-r--r--playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml b/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml
index 0ea315d0a..59cedc839 100644
--- a/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml
+++ b/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml
@@ -84,10 +84,10 @@
# Only check if docker upgrade is required if docker_upgrade is not
# already set to False.
- include: ../docker/upgrade_check.yml
- when: docker_upgrade is not defined or docker_upgrade | bool
+ when: docker_upgrade is not defined or docker_upgrade | bool and not openshift.common.is_atomic | bool
- include: ../docker/upgrade.yml
- when: l_docker_upgrade is defined and l_docker_upgrade | bool
+ when: l_docker_upgrade is defined and l_docker_upgrade | bool and not openshift.common.is_atomic | bool
- include: rpm_upgrade.yml
vars: