diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-10-03 10:19:20 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-03 10:19:20 -0700 |
| commit | 071d8abd3f0443095b6fdc262fc98c856e789fc2 (patch) | |
| tree | 7d3232676d4ad63d2bf5f49eead07f26043c85e3 /playbooks | |
| parent | ee0a668a8848b6d707a57de1b908584cf0b28d5d (diff) | |
| parent | f044094cc8f795871edf3a8abca5692e4d96d9ab (diff) | |
| download | openshift-071d8abd3f0443095b6fdc262fc98c856e789fc2.tar.gz openshift-071d8abd3f0443095b6fdc262fc98c856e789fc2.tar.bz2 openshift-071d8abd3f0443095b6fdc262fc98c856e789fc2.tar.xz openshift-071d8abd3f0443095b6fdc262fc98c856e789fc2.zip | |
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.
Diffstat (limited to 'playbooks')
| -rw-r--r-- | playbooks/common/openshift-master/set_network_facts.yml | 8 |
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 |