Merge pull request #2637 from dgoodwin/ctrl-plane-restart

Fix and reorder control plane service restart.

playbooks/byo/openshift-cluster/upgrades/v3_3/upgrade.yml

@@ -92,10 +92,9 @@
   vars:
     master_config_hook: "v3_3/master_config_upgrade.yml"
 
+- include: ../../../../common/openshift-cluster/upgrades/post_control_plane.yml
+
 - include: ../../../../common/openshift-cluster/upgrades/upgrade_nodes.yml
   vars:
     node_config_hook: "v3_3/node_config_upgrade.yml"
 
-- include: ../../../openshift-master/restart.yml
-
-- include: ../../../../common/openshift-cluster/upgrades/post_control_plane.yml

playbooks/byo/openshift-cluster/upgrades/v3_3/upgrade_control_plane.yml

@@ -98,3 +98,4 @@
     master_config_hook: "v3_3/master_config_upgrade.yml"
 
 - include: ../../../../common/openshift-cluster/upgrades/post_control_plane.yml
+

playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml

@@ -99,6 +99,8 @@
   - include: rpm_upgrade.yml component=master
     when: not openshift.common.is_containerized | bool
 
+# Create service signer cert when missing. Service signer certificate
+# is added to master config in the master config hook for v3_3.
 - name: Determine if service signer cert must be created
   hosts: oo_first_master
   tasks:
@@ -108,8 +110,6 @@
     register: service_signer_cert_stat
     changed_when: false
 
-# Create service signer cert when missing. Service signer certificate
-# is added to master config in the master config hook for v3_3.
 - include: create_service_signer_cert.yml
 
 - name: Upgrade master config and systemd units
@@ -128,13 +128,6 @@
   - name: Update systemd units
     include: ../../../../roles/openshift_master/tasks/systemd_units.yml
 
-#  - name: Upgrade master configuration
-#    openshift_upgrade_config:
-#      from_version: '3.1'
-#       to_version: '3.2'
-#      role: master
-#      config_base: "{{ hostvars[inventory_hostname].openshift.common.config_base }}"
-
   - name: Check for ca-bundle.crt
     stat:
       path: "{{ openshift.common.config_base }}/master/ca-bundle.crt"
@@ -184,6 +177,10 @@
       msg: "Upgrade cannot continue. The following masters did not finish updating: {{ master_update_failed | join(',') }}"
     when: master_update_failed | length > 0
 
+# We are now ready to restart master services (or entire system
+# depending on openshift_rolling_restart_mode):
+- include: ../../openshift-master/restart.yml
+
 ###############################################################################
 # Reconcile Cluster Roles, Cluster Role Bindings and Security Context Constraints
 ###############################################################################