summaryrefslogtreecommitdiffstats
path: root/playbooks/common
diff options
context:
space:
mode:
authorMichael Gugino <mgugino@redhat.com>2018-02-12 14:00:05 -0500
committerMichael Gugino <mgugino@redhat.com>2018-02-12 14:29:24 -0500
commitdeaf085cdb902e5b5404280c84b96511e83b20ac (patch)
tree3bee70db4fccca1104260228016673c7c3590a8e /playbooks/common
parentf9f61beed982ba841c872b5fc082c6dc05ad27b1 (diff)
downloadopenshift-deaf085cdb902e5b5404280c84b96511e83b20ac.tar.gz
openshift-deaf085cdb902e5b5404280c84b96511e83b20ac.tar.bz2
openshift-deaf085cdb902e5b5404280c84b96511e83b20ac.tar.xz
openshift-deaf085cdb902e5b5404280c84b96511e83b20ac.zip
Fix docker_upgrade variable
Currently, docker_upgrade is ignored during cluster upgrades. This commit ensures that the variable is respected. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1543714
Diffstat (limited to 'playbooks/common')
-rw-r--r--playbooks/common/openshift-cluster/upgrades/docker/docker_upgrade.yml2
-rw-r--r--playbooks/common/openshift-cluster/upgrades/pre/config.yml1
2 files changed, 2 insertions, 1 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/docker/docker_upgrade.yml b/playbooks/common/openshift-cluster/upgrades/docker/docker_upgrade.yml
index 8392e21ee..094c70b46 100644
--- a/playbooks/common/openshift-cluster/upgrades/docker/docker_upgrade.yml
+++ b/playbooks/common/openshift-cluster/upgrades/docker/docker_upgrade.yml
@@ -19,7 +19,7 @@
- import_role:
name: container_runtime
tasks_from: docker_upgrade_check.yml
- when: docker_upgrade is not defined or docker_upgrade | bool
+ when: docker_upgrade | default(True) | bool
# If a node fails, halt everything, the admin will need to clean up and we
diff --git a/playbooks/common/openshift-cluster/upgrades/pre/config.yml b/playbooks/common/openshift-cluster/upgrades/pre/config.yml
index 44af37b2d..c027fc8f5 100644
--- a/playbooks/common/openshift-cluster/upgrades/pre/config.yml
+++ b/playbooks/common/openshift-cluster/upgrades/pre/config.yml
@@ -79,3 +79,4 @@
- import_role:
name: container_runtime
tasks_from: docker_upgrade_check.yml
+ when: docker_upgrade | default(True) | bool