diff options
author | Scott Dodson <sdodson@redhat.com> | 2017-01-19 09:36:30 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-19 09:36:30 -0500 |
commit | 5a554ef3c2892f71c4c0c6be162185f312ba67e7 (patch) | |
tree | f0e61ea3050692b9b544c91a223e378f7065251f /playbooks | |
parent | b3f0b74e6fd07d2148b896ef572ea4d9cd025371 (diff) | |
parent | 22b3df077cdc2da58b5f8b7f20a9a68622557282 (diff) | |
download | openshift-5a554ef3c2892f71c4c0c6be162185f312ba67e7.tar.gz openshift-5a554ef3c2892f71c4c0c6be162185f312ba67e7.tar.bz2 openshift-5a554ef3c2892f71c4c0c6be162185f312ba67e7.tar.xz openshift-5a554ef3c2892f71c4c0c6be162185f312ba67e7.zip |
Merge pull request #3093 from mtnbikenc/upgrade-fix
Correct consistency between upgrade playbooks
Diffstat (limited to 'playbooks')
-rw-r--r-- | playbooks/byo/openshift-cluster/upgrades/v3_4/upgrade_control_plane.yml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/playbooks/byo/openshift-cluster/upgrades/v3_4/upgrade_control_plane.yml b/playbooks/byo/openshift-cluster/upgrades/v3_4/upgrade_control_plane.yml index 5a7937aed..92d7c943a 100644 --- a/playbooks/byo/openshift-cluster/upgrades/v3_4/upgrade_control_plane.yml +++ b/playbooks/byo/openshift-cluster/upgrades/v3_4/upgrade_control_plane.yml @@ -98,5 +98,7 @@ - include: ../../../../common/openshift-cluster/upgrades/cleanup_unused_images.yml - include: ../../../../common/openshift-cluster/upgrades/upgrade_control_plane.yml + vars: + master_config_hook: "v3_4/master_config_upgrade.yml" - include: ../../../../common/openshift-cluster/upgrades/post_control_plane.yml |