diff options
| author | Devan Goodwin <dgoodwin@redhat.com> | 2016-10-20 12:07:29 -0300 |
|---|---|---|
| committer | Devan Goodwin <dgoodwin@redhat.com> | 2016-10-21 13:44:50 -0300 |
| commit | abbeb683f26ce4a6db2ea17cd7f3c21f8245d10f (patch) | |
| tree | f48793b37a73f240f5c34b28593dfa8dd4406eb8 /playbooks/byo/openshift-cluster | |
| parent | 9fa3c6c98420e4e340507193fd3ad80c15e5c19e (diff) | |
| download | openshift-abbeb683f26ce4a6db2ea17cd7f3c21f8245d10f.tar.gz openshift-abbeb683f26ce4a6db2ea17cd7f3c21f8245d10f.tar.bz2 openshift-abbeb683f26ce4a6db2ea17cd7f3c21f8245d10f.tar.xz openshift-abbeb683f26ce4a6db2ea17cd7f3c21f8245d10f.zip | |
Fix and reorder control plane service restart.
This was missed in the standalone upgrade control plane playbook.
However it also looks to be out of order, we should restart before
reconciling and upgrading nodes. As such moved the restart directly into
the control plane upgrade common code, and placed it before
reconciliation.
Diffstat (limited to 'playbooks/byo/openshift-cluster')
| -rw-r--r-- | playbooks/byo/openshift-cluster/upgrades/v3_3/upgrade.yml | 5 | ||||
| -rw-r--r-- | playbooks/byo/openshift-cluster/upgrades/v3_3/upgrade_control_plane.yml | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/playbooks/byo/openshift-cluster/upgrades/v3_3/upgrade.yml b/playbooks/byo/openshift-cluster/upgrades/v3_3/upgrade.yml index 7a3829283..9a5d84751 100644 --- a/playbooks/byo/openshift-cluster/upgrades/v3_3/upgrade.yml +++ b/playbooks/byo/openshift-cluster/upgrades/v3_3/upgrade.yml @@ -92,10 +92,9 @@ vars: master_config_hook: "v3_3/master_config_upgrade.yml" +- include: ../../../../common/openshift-cluster/upgrades/post_control_plane.yml + - include: ../../../../common/openshift-cluster/upgrades/upgrade_nodes.yml vars: node_config_hook: "v3_3/node_config_upgrade.yml" -- include: ../../../openshift-master/restart.yml - -- include: ../../../../common/openshift-cluster/upgrades/post_control_plane.yml diff --git a/playbooks/byo/openshift-cluster/upgrades/v3_3/upgrade_control_plane.yml b/playbooks/byo/openshift-cluster/upgrades/v3_3/upgrade_control_plane.yml index d6af71827..c9338a960 100644 --- a/playbooks/byo/openshift-cluster/upgrades/v3_3/upgrade_control_plane.yml +++ b/playbooks/byo/openshift-cluster/upgrades/v3_3/upgrade_control_plane.yml @@ -98,3 +98,4 @@ master_config_hook: "v3_3/master_config_upgrade.yml" - include: ../../../../common/openshift-cluster/upgrades/post_control_plane.yml + |