Adds OS_REGION_NAME into overcloudrc files

[apex.git] / lib / ansible / playbooks / post_deploy_undercloud.yml

diff --git a/lib/ansible/playbooks/post_deploy_undercloud.yml b/lib/ansible/playbooks/post_deploy_undercloud.yml
index bd62f9c..a8f1cd5 100644 (file)
--- a/lib/ansible/playbooks/post_deploy_undercloud.yml
+++ b/lib/ansible/playbooks/post_deploy_undercloud.yml
@@ -18,10 +18,23 @@
     - name: Find admin project id
       shell: "{{ overcloudrc }} && openstack project list | grep admin | awk '{print $2}'"
       register: os_project_id
+    - name: Ensure rc files owned by stack
+      file:
+        path: "/home/stack/{{ item }}"
+        state: file
+        owner: stack
+        group: stack
+        mode: 0644
+      become: yes
+      with_items:
+        - overcloudrc
+        - overcloudrc.v3
     - name: Inject OS_PROJECT_ID and OS_TENANT_NAME into overcloudrc
       lineinfile:
         line: "{{ item }}"
         path: /home/stack/overcloudrc
+      become: yes
+      become_user: stack
       with_items:
         - "export OS_PROJECT_ID={{ os_project_id.stdout }}"
         - "export OS_TENANT_NAME=admin"
@@ -59,6 +72,23 @@
         regexp: 'SDN_CONTROLLER_IP'
         path: "/home/stack/{{ item }}"
       when: sdn != false
+      become: yes
+      become_user: stack
+      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
@@ -115,6 +145,7 @@
       become_user: stack
       when: congress
       with_items: "{{ congress_datasources }}"
+      ignore_errors: yes
     - name: Configure Calipso
       block:
         - name: Install Calipso dependencies