diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-11-29 13:14:03 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-29 13:14:03 -0500 |
| commit | 7dab56735962e1c83a2d16cec9e0966efa3b061e (patch) | |
| tree | ef0be0b491879e3368a996e222e1da79f40d3edb | |
| parent | ba76d3b2f53d983232675aeed61982fa42459936 (diff) | |
| parent | 27c0a29f266def67e22667fef6823062b8167be5 (diff) | |
| download | openshift-7dab56735962e1c83a2d16cec9e0966efa3b061e.tar.gz openshift-7dab56735962e1c83a2d16cec9e0966efa3b061e.tar.bz2 openshift-7dab56735962e1c83a2d16cec9e0966efa3b061e.tar.xz openshift-7dab56735962e1c83a2d16cec9e0966efa3b061e.zip | |
Merge pull request #2831 from dgoodwin/upgrade-ordering
Fix rare failure to deploy new registry/router after upgrade.
| -rw-r--r-- | playbooks/byo/openshift-cluster/upgrades/v3_3/upgrade.yml | 4 | ||||
| -rw-r--r-- | playbooks/byo/openshift-cluster/upgrades/v3_4/upgrade.yml | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/playbooks/byo/openshift-cluster/upgrades/v3_3/upgrade.yml b/playbooks/byo/openshift-cluster/upgrades/v3_3/upgrade.yml index 9a5d84751..7b915248b 100644 --- a/playbooks/byo/openshift-cluster/upgrades/v3_3/upgrade.yml +++ b/playbooks/byo/openshift-cluster/upgrades/v3_3/upgrade.yml @@ -92,9 +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: ../../../../common/openshift-cluster/upgrades/post_control_plane.yml + diff --git a/playbooks/byo/openshift-cluster/upgrades/v3_4/upgrade.yml b/playbooks/byo/openshift-cluster/upgrades/v3_4/upgrade.yml index 4f8a80ee8..4530f79cf 100644 --- a/playbooks/byo/openshift-cluster/upgrades/v3_4/upgrade.yml +++ b/playbooks/byo/openshift-cluster/upgrades/v3_4/upgrade.yml @@ -90,7 +90,7 @@ - include: ../../../../common/openshift-cluster/upgrades/upgrade_control_plane.yml -- include: ../../../../common/openshift-cluster/upgrades/post_control_plane.yml - - include: ../../../../common/openshift-cluster/upgrades/upgrade_nodes.yml +- include: ../../../../common/openshift-cluster/upgrades/post_control_plane.yml + |