summaryrefslogtreecommitdiffstats
path: root/playbooks/common/openshift-cluster
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-10-25 12:57:46 -0400
committerGitHub <noreply@github.com>2016-10-25 12:57:46 -0400
commit57b02c82bc470461f434888c9e8bb493e7a8a9e3 (patch)
tree45fc4023906f310f9625ce2b528c6c6deee096d3 /playbooks/common/openshift-cluster
parent70a68bc2f948f7ad527867c702396182bb9323e8 (diff)
parentabbeb683f26ce4a6db2ea17cd7f3c21f8245d10f (diff)
downloadopenshift-57b02c82bc470461f434888c9e8bb493e7a8a9e3.tar.gz
openshift-57b02c82bc470461f434888c9e8bb493e7a8a9e3.tar.bz2
openshift-57b02c82bc470461f434888c9e8bb493e7a8a9e3.tar.xz
openshift-57b02c82bc470461f434888c9e8bb493e7a8a9e3.zip
Merge pull request #2637 from dgoodwin/ctrl-plane-restart
Fix and reorder control plane service restart.
Diffstat (limited to 'playbooks/common/openshift-cluster')
-rw-r--r--playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml15
1 files changed, 6 insertions, 9 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml b/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml
index b3f4d7d1a..927d9b4ca 100644
--- a/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml
+++ b/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
###############################################################################