From: Feng Pan <fpan@redhat.com>
Date: Tue, 13 Mar 2018 14:05:39 +0000 (+0000)
Subject: Merge "Adds OS_REGION_NAME into overcloudrc files"
X-Git-Tag: opnfv-6.0.0~19
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=b83b80ebb8b1419d8fa39554fedbddfc92039b3c;hp=67e7b3c76402445d7e62d5953d661794ec1f7c6d;p=apex.git

Merge "Adds OS_REGION_NAME into overcloudrc files"
---

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