diff options
| author | Michael Gugino <mgugino@redhat.com> | 2017-10-25 09:36:52 -0400 |
|---|---|---|
| committer | Michael Gugino <mgugino@redhat.com> | 2017-10-25 09:36:52 -0400 |
| commit | ae494abf95c0904e0b61887eca8e430a32e33646 (patch) | |
| tree | 141b7e382d1483df5d2a49e7d697661d7a2a076b /playbooks | |
| parent | 3dea8bceeb98d5a30f0223f7109cc78caa3a6b8f (diff) | |
| download | openshift-ae494abf95c0904e0b61887eca8e430a32e33646.tar.gz openshift-ae494abf95c0904e0b61887eca8e430a32e33646.tar.bz2 openshift-ae494abf95c0904e0b61887eca8e430a32e33646.tar.xz openshift-ae494abf95c0904e0b61887eca8e430a32e33646.zip | |
Add master config upgrade hook to upgrade-all plays
Currently, in 1.5, 3.6, 1.7 upgrade-all plays, control
plane upgrades are not called correctly.
This commit ensures the master config hook is appropriately
applied during these upgrades to match the steps in
control plane only upgrades.
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1486054
Diffstat (limited to 'playbooks')
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 |