Add master config hook for 3.4 upgrade and fix facts ordering for config hook run.

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

@@ -89,6 +89,8 @@
   - include: ../../../../common/openshift-cluster/upgrades/cleanup_unused_images.yml
 
 - include: ../../../../common/openshift-cluster/upgrades/upgrade_control_plane.yml
+  vars:
+    master_config_hook: "v3_4/master_config_upgrade.yml"
 
 - include: ../../../../common/openshift-cluster/upgrades/upgrade_nodes.yml
 

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 }}"