Merge pull request #5621 from abutcher/scaleup-portal-net

Automatic merge from submit-queue.

Ensure openshift.common.portal_net updated during scaleup.

https://bugzilla.redhat.com/show_bug.cgi?id=1451023

This fact is set in `initialize_facts.yml` at the beginning of scaleup so make sure that we update this fact if we read a different value from the first master's config file.

playbooks/common/openshift-master/set_network_facts.yml

@@ -13,7 +13,9 @@
 - name: Set network facts for masters
   hosts: oo_masters_to_config
   gather_facts: no
-  tasks:
+  roles:
+  - role: openshift_facts
+  post_tasks:
   - block:
     - set_fact:
         osm_cluster_network_cidr: "{{ (hostvars[groups.oo_first_master.0].g_master_config_slurp.content|b64decode|from_yaml).networkConfig.clusterNetworkCIDR }}"
@@ -24,5 +26,9 @@
     - set_fact:
         openshift_portal_net: "{{ (hostvars[groups.oo_first_master.0].g_master_config_slurp.content|b64decode|from_yaml).networkConfig.serviceNetworkCIDR }}"
       when: openshift_portal_net is not defined
+    - openshift_facts:
+        role: common
+        local_facts:
+          portal_net: "{{ openshift_portal_net | default(openshift_master_portal_net) | default(None) }}"
     when:
     - hostvars[groups.oo_first_master.0].g_master_config_stat.stat.exists | bool