Merge pull request #5875 from mgugino-upstream-stage/fix-upgrade-config-hook

This previously passed all CI tests, merge queue broke last night.

Merging, this is a blocker bug.

playbooks/common/openshift-cluster/upgrades/v3_5/upgrade.yml

@@ -112,6 +112,8 @@
   - include: ../cleanup_unused_images.yml
 
 - include: ../upgrade_control_plane.yml
+  vars:
+    master_config_hook: "v3_5/master_config_upgrade.yml"
 
 - include: ../upgrade_nodes.yml
 

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
 

playbooks/common/openshift-cluster/upgrades/v3_7/upgrade.yml

@@ -119,9 +119,9 @@
   tasks:
   - include: ../cleanup_unused_images.yml
 
-#TODO: Why doesn't this compose using ./upgrade_control_plane rather than
-# ../upgrade_control_plane?
 - include: ../upgrade_control_plane.yml
+  vars:
+    master_config_hook: "v3_7/master_config_upgrade.yml"
 
 # All controllers must be stopped at the same time then restarted
 - name: Cycle all controller services to force new leader election mode