diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-10-25 12:57:46 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-25 12:57:46 -0400 |
| commit | 57b02c82bc470461f434888c9e8bb493e7a8a9e3 (patch) | |
| tree | 45fc4023906f310f9625ce2b528c6c6deee096d3 /playbooks/byo/openshift-cluster | |
| parent | 70a68bc2f948f7ad527867c702396182bb9323e8 (diff) | |
| parent | abbeb683f26ce4a6db2ea17cd7f3c21f8245d10f (diff) | |
| download | openshift-57b02c82bc470461f434888c9e8bb493e7a8a9e3.tar.gz openshift-57b02c82bc470461f434888c9e8bb493e7a8a9e3.tar.bz2 openshift-57b02c82bc470461f434888c9e8bb493e7a8a9e3.tar.xz openshift-57b02c82bc470461f434888c9e8bb493e7a8a9e3.zip | |
Merge pull request #2637 from dgoodwin/ctrl-plane-restart
Fix and reorder control plane service restart.
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 + |