summaryrefslogtreecommitdiffstats
path: root/playbooks/byo
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-12-16 18:55:51 -0500
committerGitHub <noreply@github.com>2016-12-16 18:55:51 -0500
commitb8109cdf7e909eb6a255c795a99b078b850f49f0 (patch)
treea9fa8c0add5a7fdb782c49b6f1506a86510fb49f /playbooks/byo
parentfd917d5726e2e8973a9941d9fa590a1594d9640a (diff)
parent5d731d068a8291d8b81c58f0e99ec3d6740eaf7b (diff)
downloadopenshift-b8109cdf7e909eb6a255c795a99b078b850f49f0.tar.gz
openshift-b8109cdf7e909eb6a255c795a99b078b850f49f0.tar.bz2
openshift-b8109cdf7e909eb6a255c795a99b078b850f49f0.tar.xz
openshift-b8109cdf7e909eb6a255c795a99b078b850f49f0.zip
Merge pull request #2989 from abutcher/3.4-master-config-hook
Add master config hook for 3.4 upgrade and fix facts ordering
Diffstat (limited to 'playbooks/byo')
-rw-r--r--playbooks/byo/openshift-cluster/upgrades/v3_4/upgrade.yml2
1 files changed, 2 insertions, 0 deletions
diff --git a/playbooks/byo/openshift-cluster/upgrades/v3_4/upgrade.yml b/playbooks/byo/openshift-cluster/upgrades/v3_4/upgrade.yml
index 496b00697..d6115e7a5 100644
--- a/playbooks/byo/openshift-cluster/upgrades/v3_4/upgrade.yml
+++ b/playbooks/byo/openshift-cluster/upgrades/v3_4/upgrade.yml
@@ -89,6 +89,8 @@
- 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/upgrade_nodes.yml