diff options
| -rw-r--r-- | build/nics-template.yaml.jinja2 | 4 | ||||
| -rw-r--r-- | lib/ansible/playbooks/post_deploy_undercloud.yml | 15 |
2 files changed, 19 insertions, 0 deletions
diff --git a/build/nics-template.yaml.jinja2 b/build/nics-template.yaml.jinja2 index 93d3dc14..b1069d2c 100644 --- a/build/nics-template.yaml.jinja2 +++ b/build/nics-template.yaml.jinja2 @@ -87,7 +87,11 @@ resources: - {%- if not nets['external'][0]['enabled'] or nets['tenant']['nic_mapping'][role]['vlan'] is number or nets['storage']['nic_mapping'][role]['vlan'] is number or nets['api']['nic_mapping'][role]['vlan'] is number or nets['external'][0]['nic_mapping'][role]['vlan'] is number %} type: ovs_bridge + {%- if nets['external'][0]['enabled'] and nets['external'][0]['nic_mapping'][role]['vlan'] == 'native' %} + name: br-isolated + {%- else %} name: {get_input: bridge_name} + {%- endif %} members: - type: interface diff --git a/lib/ansible/playbooks/post_deploy_undercloud.yml b/lib/ansible/playbooks/post_deploy_undercloud.yml index 2e1bf0f3..a8f1cd55 100644 --- a/lib/ansible/playbooks/post_deploy_undercloud.yml +++ b/lib/ansible/playbooks/post_deploy_undercloud.yml @@ -77,6 +77,21 @@ with_items: - overcloudrc - overcloudrc.v3 + - name: Register OS Region + shell: "{{ overcloudrc }} && openstack endpoint list -c Region -f json" + register: region + become: yes + become_user: stack + - name: Write Region into overcloudrc + lineinfile: + line: "export OS_REGION_NAME={{(region.stdout|from_json)[1]['Region']}}" + regexp: 'OS_REGION_NAME' + path: "/home/stack/{{ item }}" + become: yes + become_user: stack + with_items: + - overcloudrc + - overcloudrc.v3 - name: Undercloud NAT - MASQUERADE interface iptables: table: nat |