diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-09-21 09:57:12 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-21 09:57:12 -0400 |
| commit | fd9ff637477df20a399632f2360362bc3a0b4be2 (patch) | |
| tree | 918339949ed121df90e57e87054e6e09d543ed8a /playbooks/common/openshift-master | |
| parent | b9941e458dfa09b5e62bf00e193aceb8d175c03a (diff) | |
| parent | 4a79cbe618652748974a4abd4c19c6a3dc800b2b (diff) | |
| download | openshift-fd9ff637477df20a399632f2360362bc3a0b4be2.tar.gz openshift-fd9ff637477df20a399632f2360362bc3a0b4be2.tar.bz2 openshift-fd9ff637477df20a399632f2360362bc3a0b4be2.tar.xz openshift-fd9ff637477df20a399632f2360362bc3a0b4be2.zip | |
Merge pull request #5473 from abutcher/scaleup-network-values
Set network facts using first master's config during scaleup.
Diffstat (limited to 'playbooks/common/openshift-master')
| -rw-r--r-- | playbooks/common/openshift-master/scaleup.yml | 2 | ||||
| -rw-r--r-- | playbooks/common/openshift-master/set_network_facts.yml | 28 |
2 files changed, 30 insertions, 0 deletions
diff --git a/playbooks/common/openshift-master/scaleup.yml b/playbooks/common/openshift-master/scaleup.yml index 17f9ef4bc..8c366e038 100644 --- a/playbooks/common/openshift-master/scaleup.yml +++ b/playbooks/common/openshift-master/scaleup.yml @@ -43,6 +43,8 @@ delay: 1 changed_when: false +- include: ../openshift-master/set_network_facts.yml + - include: ../openshift-master/config.yml - include: ../openshift-loadbalancer/config.yml diff --git a/playbooks/common/openshift-master/set_network_facts.yml b/playbooks/common/openshift-master/set_network_facts.yml new file mode 100644 index 000000000..2ad805858 --- /dev/null +++ b/playbooks/common/openshift-master/set_network_facts.yml @@ -0,0 +1,28 @@ +--- +- name: Read first master\'s config + hosts: oo_first_master + gather_facts: no + tasks: + - stat: + path: "{{ openshift.common.config_base }}/master/master-config.yaml" + register: g_master_config_stat + - slurp: + src: "{{ openshift.common.config_base }}/master/master-config.yaml" + register: g_master_config_slurp + +- name: Set network facts for masters + hosts: oo_masters_to_config + gather_facts: no + tasks: + - block: + - set_fact: + osm_cluster_network_cidr: "{{ (hostvars[groups.oo_first_master.0].g_master_config_slurp.content|b64decode|from_yaml).networkConfig.clusterNetworkCIDR }}" + when: osm_cluster_network_cidr is not defined + - set_fact: + osm_host_subnet_length: "{{ (hostvars[groups.oo_first_master.0].g_master_config_slurp.content|b64decode|from_yaml).networkConfig.hostSubnetLength }}" + when: osm_host_subnet_length is not defined + - 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 + when: + - hostvars[groups.oo_first_master.0].g_master_config_stat.stat.exists | bool |