reworked regions and started work on aws

AWS/redirector.yml

@@ -43,42 +43,107 @@
         mode: "0600"
       when: redirector_key_pair.changed and redirector_key_pair.key.private_key is defined
 
-    - name: Create a security group for the redirector
-      amazon.aws.ec2_group:
-        access_key: "{{ aws_access_key }}"
-        secret_key: "{{ aws_secret_key }}"
-        name: "{{ redirector_name }}-sg"
-        description: "Security group for redirector {{ redirector_name }}"
+    - name: Check if VPC exists with specified ID (if provided)
+      amazon.aws.ec2_vpc_net_info:
+        vpc_ids: "{{ vpc_id | default(omit) }}"
         region: "{{ aws_region }}"
-        rules:
-          - proto: tcp
-            ports: 
-              - 22
-              - 80
-              - 443
-              - "{{ shell_handler_port }}"
-            cidr_ip: 0.0.0.0/0
-        rules_egress:
-          - proto: -1
-            cidr_ip: 0.0.0.0/0
-      register: redirector_sg_result
+      register: vpc_info
+      when: vpc_id is defined and vpc_id | length > 0
 
-    - name: Launch redirector EC2 instance
-      amazon.aws.ec2_instance:
-        access_key: "{{ aws_access_key }}"
-        secret_key: "{{ aws_secret_key }}"
+    - name: Create VPC if not provided or not found
+      amazon.aws.ec2_vpc_net:
+        name: "{{ redirector_name }}-vpc"
+        cidr_block: "10.0.0.0/16"
         region: "{{ aws_region }}"
+        tags:
+          Name: "{{ redirector_name }}-vpc"
+          redirector_name: "{{ redirector_name }}"
+      register: vpc_result
+      when: vpc_id is not defined or vpc_id | length == 0 or (vpc_info.vpcs | default([]) | length == 0)
+
+    - name: Set VPC ID from existing or newly created VPC
+      set_fact:
+        vpc_id: "{{ vpc_id if (vpc_id is defined and vpc_id | length > 0 and vpc_info.vpcs | length > 0) else vpc_result.vpc.id }}"
+
+    - name: Create internet gateway for VPC
+      amazon.aws.ec2_vpc_igw:
+        vpc_id: "{{ vpc_id }}"
+        region: "{{ aws_region }}"
+        state: present
+        tags:
+          Name: "{{ redirector_name }}-igw"
+          redirector_name: "{{ redirector_name }}"
+      register: igw_result
+      when: vpc_result.changed | default(false)
+
+    - name: Create subnet in VPC
+      amazon.aws.ec2_vpc_subnet:
+        vpc_id: "{{ vpc_id }}"
+        cidr: "10.0.1.0/24"
+        region: "{{ aws_region }}"
+        az: "{{ aws_region }}a"
+        map_public: yes
+        tags:
+          Name: "{{ redirector_name }}-subnet"
+          redirector_name: "{{ redirector_name }}"
+      register: subnet_result
+      when: vpc_result.changed | default(false)
+
+    - name: Create routing table for internet access
+      amazon.aws.ec2_vpc_route_table:
+        vpc_id: "{{ vpc_id }}"
+        region: "{{ aws_region }}"
+        tags:
+          Name: "{{ redirector_name }}-rtb"
+          redirector_name: "{{ redirector_name }}"
+        routes:
+          - dest: "0.0.0.0/0"
+            gateway_id: "{{ igw_result.gateway_id }}"
+        subnets:
+          - "{{ subnet_result.subnet.id }}"
+      register: route_table_result
+      when: vpc_result.changed | default(false) and igw_result.changed | default(false) and subnet_result.changed | default(false)
+
+    - name: Set region for AWS redirector
+      set_fact:
+        aws_redirector_region: "{{ aws_region | default(region, true) | default('us-east-1', true) }}"
+      when: aws_region_choices is not defined or aws_region_choices|length == 0
+
+    - name: Set random region for AWS redirector
+      set_fact:
+        aws_redirector_region: "{{ aws_region_choices | random }}"
+      when: aws_region_choices is defined and aws_region_choices|length > 0 and aws_redirector_region is not defined
+
+    - name: Launch EC2 instance for redirector
+      amazon.aws.ec2_instance:
         name: "{{ redirector_name }}"
-        image_id: "{{ ami_map[aws_region] }}"
-        instance_type: "{{ instance_type }}"
-        key_name: "{{ redirector_name }}"
-        security_groups:
-          - "{{ redirector_name }}-sg"
+        key_name: "{{ aws_keypair_name }}"
+        instance_type: "{{ instance_type | default('t2.micro') }}"
+        security_group: "{{ redirector_name }}-sg"
+        image_id: "{{ ami_id }}"
+        region: "{{ aws_redirector_region }}"
+        state: present
         wait: yes
         tags:
           Name: "{{ redirector_name }}"
-          Role: "redirector"
-      register: redirector_instance
+      register: ec2
+
+    - name: Launch EC2 instance for redirector
+      amazon.aws.ec2_instance:
+        name: "{{ redirector_name }}"
+        key_name: "{{ aws_keypair_name }}"
+        vpc_subnet_id: "{{ subnet_result.subnet.id | default(omit) }}"
+        instance_type: "{{ instance_type | default('t2.micro') }}"
+        security_group: "{{ redirector_name }}-sg"
+        network:
+          assign_public_ip: true
+        image_id: "{{ ami_id }}"
+        region: "{{ aws_region }}"
+        state: present
+        wait: yes
+        tags:
+          Name: "{{ redirector_name }}"
+      register: ec2
 
     - name: Set redirector_ip for later use
       set_fact: