From: Feng Pan <fpan@redhat.com>
Date: Tue, 13 Mar 2018 14:07:23 +0000 (+0000)
Subject: Merge "Enabling extra bridge for native external network"
X-Git-Tag: opnfv-6.0.0~18
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=29367db39d60da9ba839e0ee2254b164fd43e2a1;hp=8ed6771038060ee0057dab56c5ec95d6c8b8e49f;p=apex.git

Merge "Enabling extra bridge for native external network"
---

diff --git a/ci/PR_revision.log b/ci/PR_revision.log
index 0d856e68..9aecb90f 100644
--- a/ci/PR_revision.log
+++ b/ci/PR_revision.log
@@ -13,3 +13,5 @@ apex-puppet-tripleo, I486c4045e29c7032526be6e19d11e7979070c2d9
 apex-os-net-config, Idaf03d78d2ce657ac484c1285a795d98760d0112
 apex-tripleo-heat-templates, Ib94b0182fd5fbc3a254cae5862a82982bf3131be
 apex-tripleo-heat-templates, I1b4d3eea61e29e1ede0e06d78fde842ef13b7b8e
+
+apex-tripleo-heat-templates, I37039207bc7cf9965d26e6dfa034e84bf9b7224d
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