summaryrefslogtreecommitdiffstats
path: root/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2
diff options
context:
space:
mode:
authorDevan Goodwin <dgoodwin@redhat.com>2016-06-24 10:59:11 -0300
committerDevan Goodwin <dgoodwin@redhat.com>2016-06-24 10:59:11 -0300
commitfb2f9f9d2be747a631e9ab13cb7c7898987d509d (patch)
tree486aeddb5e2ace48d46f13e57a254ea92cf784f3 /playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2
parent82f4e4eaeaaf3059013e9ea23d87dcf89fd8455e (diff)
downloadopenshift-fb2f9f9d2be747a631e9ab13cb7c7898987d509d.tar.gz
openshift-fb2f9f9d2be747a631e9ab13cb7c7898987d509d.tar.bz2
openshift-fb2f9f9d2be747a631e9ab13cb7c7898987d509d.tar.xz
openshift-fb2f9f9d2be747a631e9ab13cb7c7898987d509d.zip
Allow skipping Docker upgrade during OpenShift upgrade.
Diffstat (limited to 'playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2')
-rw-r--r--playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml3
1 files changed, 3 insertions, 0 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 8eeb652a7..f2e408ad4 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
@@ -80,7 +80,10 @@
delegate_to: "{{ groups.oo_first_master.0 }}"
when: inventory_hostname in groups.oo_nodes_to_config
+ # 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
- include: ../docker/upgrade.yml
when: docker_upgrade is defined and docker_upgrade | bool