Move portal_net from openshift_common to openshift_facts.

playbooks/common/openshift-master/config.yml

@@ -50,10 +50,6 @@
     when: openshift_hosted_metrics_resolution is not defined
   roles:
   - openshift_facts
-  # TODO: Remove openshift_common from this roles list once
-  # openshift_master_certificates uses delegate_to and is applied to
-  # all masters rather than just the first.
-  - openshift_common
   post_tasks:
   - openshift_facts:
       role: master

roles/openshift_common/tasks/main.yml

@@ -27,7 +27,6 @@
       use_nuage: "{{ openshift_use_nuage | default(None) }}"
       use_manageiq: "{{ openshift_use_manageiq | default(None) }}"
       data_dir: "{{ openshift_data_dir | default(None) }}"
-      portal_net: "{{ openshift_portal_net | default(openshift_master_portal_net) | default(None) }}"
       use_dnsmasq: "{{ openshift_use_dnsmasq | default(None) }}"
 
 # Using oo_image_tag_to_rpm_version here is a workaround for how

roles/openshift_facts/tasks/main.yml

@@ -33,6 +33,7 @@
       is_containerized: "{{ l_is_containerized | default(None) }}"
       public_hostname: "{{ openshift_public_hostname | default(None) }}"
       public_ip: "{{ openshift_public_ip | default(None) }}"
+      portal_net: "{{ openshift_portal_net | default(openshift_master_portal_net) | default(None) }}"
 
 # had to be done outside of the above because hostname isn't yet set
 - name: Gather hostnames for proxy configuration