Update platform and runtime roles for Terraform

Signed-off-by: Jim Enright <[email protected]>

Author: jimright

roles/platform/tasks/initialize_setup_aws.yml

@@ -98,21 +98,29 @@
   block:
     - name: Discover AWS Public Subnets
       when: infra__aws_public_subnet_ids is not defined
-      block:           
-        # TODO: Change infra__vpc_public_subnets_info to plat__vpc_public_subnets_info
+      block:
+        # Search using a wildcard on the subnet Name tag           
         - name: Query AWS Public Subnets
           amazon.aws.ec2_vpc_subnet_info:
             region: "{{ plat__region }}"
             filters:
-              "tag:Name": "{{ item }}"
-          loop: "{{ infra__vpc_public_subnets_info | map(attribute='name' ) }}"
+              "tag:Name": "{{ ([plat__namespace, plat__vpc_public_subnets_suffix] | join('-')) }}*"
           register: __aws_public_subnet_info
 
         - name: Set fact for AWS Public Subnets
           ansible.builtin.set_fact:
-            plat__aws_public_subnet_ids: "{{ __aws_public_subnet_info.results | community.general.json_query('[*].subnets[*].id') | flatten }}"
+            plat__aws_public_subnet_ids: "{{ __aws_public_subnet_info | community.general.json_query('subnets[*].id') | flatten }}"
             plat__endpoint_access_scheme: "PUBLIC"
 
+    - name: Set fact for AWS Subnet IDs
+      when: __aws_subnets_info is defined
+      ansible.builtin.set_fact:
+        plat__aws_subnet_ids: "{{ plat__aws_subnet_ids | default([]) | union([__aws_subnet_item.subnet_id | default('')]) }}"
+      loop_control:
+        loop_var: __aws_subnet_item
+        label: "{{ __aws_subnet_item.subnet_id }}"
+      loop: "{{ __aws_subnets_info.subnets }}"
+
     - name: Set fact for AWS Public Subnets by assignment
       when: infra__aws_public_subnet_ids is defined
       ansible.builtin.set_fact:

roles/runtime/tasks/initialize_setup_aws.yml

@@ -15,7 +15,7 @@
 # limitations under the License.
 
 - name: Discover AWS Public and Private VPC Subnets
-  when: not infra__aws_subnet_ids
+  when: infra__aws_subnet_ids is not defined
   block:
     - name: Query AWS Public Subnets
       amazon.aws.ec2_vpc_subnet_info:
@@ -52,10 +52,10 @@
     - name: Set fact for AWS Subnet IDs
       when: __aws_public_subnets_info is defined or __aws_private_subnets_info is defined
       ansible.builtin.set_fact:
-        run__datahub_subnet_ids: "{{ run__datahub_public_subnet_ids | default([]) | union(run__datahub_private_subnet_ids) }}"
+        run__datahub_subnet_ids: "{{ run__datahub_public_subnet_ids | default([]) | union(run__datahub_private_subnet_ids | default([])) }}"
 
 - name: Set fact for AWS Subnet IDs by assignment
-  when: infra__aws_subnet_ids
+  when: infra__aws_subnet_ids is defined
   block:
     - name: Set fact for All AWS Subnet IDs by assignment
       ansible.builtin.set_fact: