openastack_tasks: Fix Undercloud Clouds (Wallaby)

For Wallaby based releases, `stackrc` uses `OS_CLOUD` to point to the
undercloud endpoint.
This patch fixes clouds generation for Wallaby release.

Change-Id: I59c8e441498b6ba78925e4c1a673738fac1aef7b
(cherry picked from commit 71e0669)

Author: vkhitrin

roles/post_install/openstack_tasks/defaults/main.yml

@@ -28,6 +28,7 @@ resource_state: present
 ### All "clouds" configuration resides within the "~/.config/openstack/clouds.yaml" file.
 ### A different cloud name could be set on each resource.
 ### As a result multiple users resources could be created at a single playbook run.
+tripleo_default_clouds_file: "{{ ansible_user_dir }}/.config/openstack/clouds.yaml"
 cloud_name: overcloud
 
 users:

roles/post_install/openstack_tasks/tasks/clouds.yml

@@ -62,9 +62,26 @@
   when: not item['stat']['exists']
   loop: "{{ stacksrc_files_stat['results'] }}"
 
-- name: Generate Clouds Dictionary
+- name: Generate Clouds Dictionary (Undercloud < 17)
   set_fact:
-    clouds_dict: "{{ undercloud_rc | combine(stacks_rc) }}"
+    clouds_dict: |
+      {%- if undercloud_version | int < 17 -%}
+        {{ undercloud_rc | combine(stacks_rc) }}
+      {%- else -%}
+        {{ stacks_rc }}
+      {%- endif -%}
+  # when: undercloud_version | int < 17
+
+- name: Save TripleO Generated Undercloud Cloud Definition (Undercloud >= 17)
+  block:
+    - name: Read TripleO Generated clouds.yaml
+      ansible.builtin.slurp:
+        src: "{{ tripleo_default_clouds_file }}"
+      register: tripleo_default_clouds_content
+    - name: Derive Undercloud Configuration
+      ansible.builtin.set_fact:
+        tripleo_undercloud_cloud_details: "{ 'undercloud': {{ (tripleo_default_clouds_content['content'] | b64decode | from_yaml)['clouds']['undercloud'] }} }"
+  when: undercloud_version | int >= 17
 
 - name: Add users to clouds.yaml
   vars:
@@ -121,9 +138,18 @@
   when: "item.rc != 1"
   loop: "{{ cloud_details.results | flatten(levels=1) }}"
 
+- name: Insert Default Undercloud >= 17
+  blockinfile:
+    dest: "{{ clouds_yaml_file_path }}"
+    block: |1
+      {{ tripleo_undercloud_cloud_details | to_nice_yaml(indent=4) }}
+    insertbefore: "#END UNDERCLOUD SECTION"
+    marker: "#{mark} UNDERCLOUD PARAMETERS"
+  when: undercloud_version | int >= 17
+
 - name: Override TripleO Generated File With User File
   ansible.builtin.copy:
     src: "{{ clouds_yaml_file_path }}"
-    dest: "{{ ansible_user_dir }}/.config/openstack/clouds.yaml"
+    dest: "{{ tripleo_default_clouds_file }}"
     remote_src: true
   when: force_tripleo_clouds_override

roles/post_install/openstack_tasks/tasks/users_clouds.yml

@@ -36,4 +36,5 @@
   set_fact:
     clouds_dict: "{{ clouds_dict | combine({item['name']: stackrc_file | dirname +'/'+ item['name'] + '_rc'}) }}"
   loop: "{{ users }}"
-  when: item.name != 'admin'
+  when:
+    - item.name != 'admin'