Merge pull request #2990 from sdodson/release-1.4

Release 1.4 backports

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/post_control_plane.yml
 

playbooks/common/openshift-cluster/upgrades/etcd/upgrade.yml

@@ -75,7 +75,7 @@
   hosts: etcd_hosts_to_upgrade
   serial: 1
   vars:
-    upgrade_version: 3.0.14
+    upgrade_version: 3.0.15
   tasks:
   - include: containerized_tasks.yml
     when: etcd_container_version.stdout | default('99') | version_compare('3.0','<') and openshift.common.is_containerized | bool

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

@@ -51,15 +51,24 @@
 
 - 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:
   - include: ../../../../roles/openshift_master/handlers/main.yml
     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 }}"