2 files changed, 9 insertions, 8 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/v3_5/upgrade.yml b/playbooks/common/openshift-cluster/upgrades/v3_5/upgrade.yml
index a3d0d6305..30e719d8f 100644
--- a/playbooks/common/openshift-cluster/upgrades/v3_5/upgrade.yml
+++ b/playbooks/common/openshift-cluster/upgrades/v3_5/upgrade.yml
@@ -47,6 +47,10 @@
   tags:
   - pre_upgrade
 
+- include: ../pre/verify_control_plane_running.yml
+  tags:
+  - pre_upgrade
+
 - include: ../disable_master_excluders.yml
   tags:
   - pre_upgrade
@@ -71,10 +75,6 @@
     # docker is configured and running.
     skip_docker_role: True
 
-- include: ../pre/verify_control_plane_running.yml
-  tags:
-  - pre_upgrade
-
 - include: ../../../openshift-master/validate_restart.yml
   tags:
   - pre_upgrade
diff --git a/playbooks/common/openshift-cluster/upgrades/v3_5/upgrade_control_plane.yml b/playbooks/common/openshift-cluster/upgrades/v3_5/upgrade_control_plane.yml
index 5fee56615..e9cec9220 100644
--- a/playbooks/common/openshift-cluster/upgrades/v3_5/upgrade_control_plane.yml
+++ b/playbooks/common/openshift-cluster/upgrades/v3_5/upgrade_control_plane.yml
@@ -55,6 +55,10 @@
   tags:
   - pre_upgrade
 
+- include: ../pre/verify_control_plane_running.yml
+  tags:
+  - pre_upgrade
+
 - include: ../disable_master_excluders.yml
   tags:
   - pre_upgrade
@@ -68,6 +72,7 @@
     # defined, and overriding the normal behavior of protecting the installed version
     openshift_release: "{{ openshift_upgrade_target }}"
     openshift_protect_installed_version: False
+    openshift_install_base_package_group: "oo_masters_to_config"
 
     # We skip the docker role at this point in upgrade to prevent
     # unintended package, container, or config upgrades which trigger
@@ -75,10 +80,6 @@
     # docker is configured and running.
     skip_docker_role: True
 
-- include: ../pre/verify_control_plane_running.yml
-  tags:
-  - pre_upgrade
-
 - include: ../../../openshift-master/validate_restart.yml
   tags:
   - pre_upgrade