From: Tim Rozet <trozet@redhat.com>
Date: Fri, 16 Mar 2018 14:22:52 +0000 (+0000)
Subject: Merge "Adding SRIOV scenario"
X-Git-Tag: opnfv-6.0.0~17
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=a008f8394e07f1b82d5bf7288f46c63252f6084f;hp=974993a17188f10acd6a1f9b2f48002b9c77ef24;p=apex.git

Merge "Adding SRIOV scenario"
---

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