From ae494abf95c0904e0b61887eca8e430a32e33646 Mon Sep 17 00:00:00 2001 From: Michael Gugino Date: Wed, 25 Oct 2017 09:36:52 -0400 Subject: Add master config upgrade hook to upgrade-all plays Currently, in 1.5, 3.6, 1.7 upgrade-all plays, control plane upgrades are not called correctly. This commit ensures the master config hook is appropriately applied during these upgrades to match the steps in control plane only upgrades. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1486054 --- playbooks/common/openshift-cluster/upgrades/v3_6/upgrade.yml | 2 ++ 1 file changed, 2 insertions(+) (limited to 'playbooks/common/openshift-cluster/upgrades/v3_6') diff --git a/playbooks/common/openshift-cluster/upgrades/v3_6/upgrade.yml b/playbooks/common/openshift-cluster/upgrades/v3_6/upgrade.yml index 920dc2ffc..dd109cfa9 100644 --- a/playbooks/common/openshift-cluster/upgrades/v3_6/upgrade.yml +++ b/playbooks/common/openshift-cluster/upgrades/v3_6/upgrade.yml @@ -116,6 +116,8 @@ - include: ../cleanup_unused_images.yml - include: ../upgrade_control_plane.yml + vars: + master_config_hook: "v3_6/master_config_upgrade.yml" - include: ../upgrade_nodes.yml -- cgit v1.2.1