summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Gugino <gugino.michael@yahoo.com>2017-10-27 09:01:45 -0400
committerGitHub <noreply@github.com>2017-10-27 09:01:45 -0400
commit36767b4902e496e2b2f217c374853eede7b44d79 (patch)
tree7e076f0afc004c09c9bce5d6ac6c72adcee0d28b
parent09465427d024b353fbd0f58a22dbda3f185341f7 (diff)
parentae494abf95c0904e0b61887eca8e430a32e33646 (diff)
downloadopenshift-36767b4902e496e2b2f217c374853eede7b44d79.tar.gz
openshift-36767b4902e496e2b2f217c374853eede7b44d79.tar.bz2
openshift-36767b4902e496e2b2f217c374853eede7b44d79.tar.xz
openshift-36767b4902e496e2b2f217c374853eede7b44d79.zip
Merge pull request #5875 from mgugino-upstream-stage/fix-upgrade-config-hook
This previously passed all CI tests, merge queue broke last night. Merging, this is a blocker bug.
-rw-r--r--playbooks/common/openshift-cluster/upgrades/v3_5/upgrade.yml2
-rw-r--r--playbooks/common/openshift-cluster/upgrades/v3_6/upgrade.yml2
-rw-r--r--playbooks/common/openshift-cluster/upgrades/v3_7/upgrade.yml4
3 files changed, 6 insertions, 2 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/v3_5/upgrade.yml b/playbooks/common/openshift-cluster/upgrades/v3_5/upgrade.yml
index 30e719d8f..bda245fe1 100644
--- a/playbooks/common/openshift-cluster/upgrades/v3_5/upgrade.yml
+++ b/playbooks/common/openshift-cluster/upgrades/v3_5/upgrade.yml
@@ -112,6 +112,8 @@
- include: ../cleanup_unused_images.yml
- include: ../upgrade_control_plane.yml
+ vars:
+ master_config_hook: "v3_5/master_config_upgrade.yml"
- include: ../upgrade_nodes.yml
diff --git a/playbooks/common/openshift-cluster/upgrades/v3_6/upgrade.yml b/playbooks/common/openshift-cluster/upgrades/v3_6/upgrade.yml
index 920dc2ffc..dd109cfa9 100644
--- a/playbooks/common/openshift-cluster/upgrades/v3_6/upgrade.yml
+++ b/playbooks/common/openshift-cluster/upgrades/v3_6/upgrade.yml
@@ -116,6 +116,8 @@
- include: ../cleanup_unused_images.yml
- include: ../upgrade_control_plane.yml
+ vars:
+ master_config_hook: "v3_6/master_config_upgrade.yml"
- include: ../upgrade_nodes.yml
diff --git a/playbooks/common/openshift-cluster/upgrades/v3_7/upgrade.yml b/playbooks/common/openshift-cluster/upgrades/v3_7/upgrade.yml
index 81f6dc8a4..f4862e321 100644
--- a/playbooks/common/openshift-cluster/upgrades/v3_7/upgrade.yml
+++ b/playbooks/common/openshift-cluster/upgrades/v3_7/upgrade.yml
@@ -119,9 +119,9 @@
tasks:
- include: ../cleanup_unused_images.yml
-#TODO: Why doesn't this compose using ./upgrade_control_plane rather than
-# ../upgrade_control_plane?
- include: ../upgrade_control_plane.yml
+ vars:
+ master_config_hook: "v3_7/master_config_upgrade.yml"
# All controllers must be stopped at the same time then restarted
- name: Cycle all controller services to force new leader election mode