Update Terraform platform for L0, L1 and L2 changes

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

Author: jimright

roles/infrastructure/tasks/setup.yml

@@ -16,6 +16,9 @@
 
 # tasks file for setup
 
+- name: Set up provider-specific Infrastructure artifacts
+  ansible.builtin.include_tasks: "setup_{{ infra__type | lower }}.yml"
+
 - name: Set up for Ansible deployment engine
   when: infra__deployment_engine == 'ansible'
   block:

roles/platform/tasks/initialize_setup_aws.yml

@@ -87,11 +87,12 @@
 - name: Discover AWS VPC Subnets
   when: infra__aws_subnet_ids is undefined
   block:
+    # Search using a wildcard on the subnet Name tag {{ plat__namespace }}*
     - name: Query AWS Subnets
       amazon.aws.ec2_vpc_subnet_info:
         region: "{{ plat__region }}"
         filters:
-          "tag:Name": "{{ plat__namespace }}"
+          "tag:Name": "{{ plat__namespace }}*"
       register: __aws_subnets_info
 
     # NOTE: jenright I had to change this for Terraform created subnets, why?
@@ -109,12 +110,65 @@
   ansible.builtin.set_fact:
     plat__aws_subnet_ids: "{{ infra__aws_subnet_ids }}"
 
-# TODO: Discover AWS VPC Public Subnets if infra__ is not present
+- name: jenright Debug value of plat__aws_subnet_ids
+  ansible.builtin.debug:
+    msg: 
+      - "infra__aws_subnet_ids: {{ infra__aws_subnet_ids | default('BLANK') }}"
+      - "__aws_subnets_info: {{ __aws_subnets_info | default('BLANK') }}"
+      - "plat__aws_subnet_ids: {{ plat__aws_subnet_ids | default('BLANK') }}"
+
+- name: Prompt added by jenright 
+  pause:
+    prompt: "Check value of plat__aws_subnet_ids"
+  when: debug_terraform | default(false) | bool
+
 - name: Set public subnets for public endpoint access
   when: plat__public_endpoint_access
-  ansible.builtin.set_fact:
-    plat__aws_public_subnet_ids: "{{ infra__aws_public_subnet_ids }}"
-    plat__endpoint_access_scheme: "PUBLIC"
+  block:
+    - name: Discover AWS Public Subnets
+      when: infra__aws_public_subnet_ids is not defined
+      block:
+        - name: Print infra__vpc_public_subnets_info names
+          debug:
+            msg:
+              - "{{ item }}"
+          loop: "{{ infra__vpc_public_subnets_info | map(attribute='name' ) }}"
+            
+        # TODO: Change infra__vpc_public_subnets_info to plat__vpc_public_subnets_info
+        - 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' ) }}"
+          register: __aws_public_subnet_info
+
+        - name: jenright Debug Print Discover AWS Public Subnets
+          ansible.builtin.debug:
+            msg: 
+            #  - "{{ __aws_public_subnet_info }}"
+             - "{{ __aws_public_subnet_info.results | community.general.json_query('[*].subnets[*].id') | flatten }}"
+
+        - name: Set fact for AWS Public Subnets
+          ansible.builtin.set_fact:
+            # plat__aws_public_subnet_ids: "{{ __aws_public_subnet_info.subnets|map(attribute='id')| list }}"
+            plat__aws_public_subnet_ids: "{{ __aws_public_subnet_info.results | community.general.json_query('[*].subnets[*].id') | flatten }}"
+            plat__endpoint_access_scheme: "PUBLIC"
+
+    - name: Set fact for AWS Public Subnets by assignment
+      when: infra__aws_public_subnet_ids is defined
+      ansible.builtin.set_fact:
+        plat__aws_public_subnet_ids: "{{ infra__aws_public_subnet_ids }}"
+        plat__endpoint_access_scheme: "PUBLIC"
+
+- name: jenright Debug Final Value of plat__aws_public_subnet_ids
+  ansible.builtin.debug:
+    var: plat__aws_public_subnet_ids
+
+- name: Prompt added by jenright 
+  pause:
+    prompt: "Check value of AWS Public Subnets"
+  when: debug_terraform | default(false) | bool
 
 - name: Discover AWS Security Group for Knox
   when: infra__aws_security_group_knox_id is undefined