summaryrefslogtreecommitdiffstats
path: root/playbooks/common/openshift-cluster
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-12-16 18:55:51 -0500
committerGitHub <noreply@github.com>2016-12-16 18:55:51 -0500
commitb8109cdf7e909eb6a255c795a99b078b850f49f0 (patch)
treea9fa8c0add5a7fdb782c49b6f1506a86510fb49f /playbooks/common/openshift-cluster
parentfd917d5726e2e8973a9941d9fa590a1594d9640a (diff)
parent5d731d068a8291d8b81c58f0e99ec3d6740eaf7b (diff)
downloadopenshift-b8109cdf7e909eb6a255c795a99b078b850f49f0.tar.gz
openshift-b8109cdf7e909eb6a255c795a99b078b850f49f0.tar.bz2
openshift-b8109cdf7e909eb6a255c795a99b078b850f49f0.tar.xz
openshift-b8109cdf7e909eb6a255c795a99b078b850f49f0.zip
Merge pull request #2989 from abutcher/3.4-master-config-hook
Add master config hook for 3.4 upgrade and fix facts ordering
Diffstat (limited to 'playbooks/common/openshift-cluster')
-rw-r--r--playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml13
1 files changed, 11 insertions, 2 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml b/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml
index 474e6311e..6950b6166 100644
--- a/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml
+++ b/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml
@@ -51,6 +51,14 @@
- include: create_service_signer_cert.yml
+# Set openshift_master_facts separately. In order to reconcile
+# admission_config's, we currently must run openshift_master_facts and
+# then run openshift_facts.
+- name: Set OpenShift master facts
+ hosts: oo_masters_to_config
+ roles:
+ - openshift_master_facts
+
- name: Upgrade master config and systemd units
hosts: oo_masters_to_config
handlers:
@@ -58,8 +66,9 @@
static: yes
roles:
- openshift_facts
- - openshift_master_facts
- tasks:
+ post_tasks:
+ - include_vars: ../../../../roles/openshift_master_facts/vars/main.yml
+
- include: upgrade_scheduler.yml
- include: "{{ master_config_hook }}"