summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Butcher <abutcher@redhat.com>2017-10-02 12:17:44 -0400
committerAndrew Butcher <abutcher@redhat.com>2017-10-02 12:17:44 -0400
commitf044094cc8f795871edf3a8abca5692e4d96d9ab (patch)
tree313029ccedbc07febb31a83f087a552fc1864e6c
parente54cb2611e86c43650512ee3afee2c6ce846b064 (diff)
downloadopenshift-f044094cc8f795871edf3a8abca5692e4d96d9ab.tar.gz
openshift-f044094cc8f795871edf3a8abca5692e4d96d9ab.tar.bz2
openshift-f044094cc8f795871edf3a8abca5692e4d96d9ab.tar.xz
openshift-f044094cc8f795871edf3a8abca5692e4d96d9ab.zip
Ensure openshift.common.portal_net updated during scaleup.
-rw-r--r--playbooks/common/openshift-master/set_network_facts.yml8
1 files changed, 7 insertions, 1 deletions
diff --git a/playbooks/common/openshift-master/set_network_facts.yml b/playbooks/common/openshift-master/set_network_facts.yml
index 2ad805858..9a6cf26fc 100644
--- a/playbooks/common/openshift-master/set_network_facts.yml
+++ b/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