summaryrefslogtreecommitdiffstats
path: root/playbooks/common
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2018-02-13 08:10:12 -0800
committerGitHub <noreply@github.com>2018-02-13 08:10:12 -0800
commite2fad4e69710c9d4fd18febd4ab60b0f12b78ef8 (patch)
treed16f4f4842bffabe5a6fc8fdcaa30fb5ac46c9a9 /playbooks/common
parenta53d6181a69df2bea769de59e9e54d9c18d8be94 (diff)
parentdeaf085cdb902e5b5404280c84b96511e83b20ac (diff)
downloadopenshift-e2fad4e69710c9d4fd18febd4ab60b0f12b78ef8.tar.gz
openshift-e2fad4e69710c9d4fd18febd4ab60b0f12b78ef8.tar.bz2
openshift-e2fad4e69710c9d4fd18febd4ab60b0f12b78ef8.tar.xz
openshift-e2fad4e69710c9d4fd18febd4ab60b0f12b78ef8.zip
Merge pull request #7116 from mgugino-upstream-stage/fix-docker-upgrade
Automatic merge from submit-queue. 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