Deployment for AWS works now

AWS/c2.yml

@@ -169,6 +169,39 @@
         c2_vpc_id: "{{ vpc_result.vpc.id }}"  # Store for cleanup reference
       when: not (use_shared_infra | bool and infra_state_file.stat.exists | default(false))
 
+    - name: Set default redirector_ip for C2-only deployments
+      set_fact:
+        redirector_ip: "{{ operator_ip }}"
+      when: c2_only | default(false) | bool and redirector_ip is not defined
+
+    - name: Load redirector_ip from infrastructure state 
+      block:
+        - name: Check if infrastructure state file exists
+          stat:
+            path: "infrastructure_state_{{ deployment_id }}.json"
+          register: infra_state_check
+        
+        - name: Load infrastructure state
+          include_vars:
+            file: "infrastructure_state_{{ deployment_id }}.json"
+            name: infra_state
+          when: infra_state_check.stat.exists
+        
+        - name: Set redirector IP from infrastructure state
+          set_fact:
+            redirector_ip: "{{ infra_state.redirector_ip | default(operator_ip) }}"
+          when: infra_state_check.stat.exists and infra_state.redirector_ip is defined
+        
+        - name: Debug redirector IP
+          debug:
+            msg: "Using redirector IP: {{ redirector_ip | default('undefined') }}"
+      when: redirector_ip is undefined
+
+    - name: Default to operator IP if redirector IP is still undefined
+      set_fact:
+        redirector_ip: "{{ operator_ip }}"
+      when: redirector_ip is undefined
+
     - name: Create security group for C2 server
       amazon.aws.ec2_security_group:
         name: "{{ c2_name }}-sg"

AWS/cleanup.yml

@@ -389,33 +389,20 @@
           - "VPC resources deleted: {{ vpc_check.vpcs | length == 0 }}"
       when: not disable_summary | default(false)
 
-    # STEP 14: Delete key pairs
-    - name: Find key pairs by name patterns
-      amazon.aws.ec2_key:
-        name: "{{ item }}"
+    # STEP 14: Delete key pairs - more reliable implementation
+    - name: Find key pairs related to deployment
+      amazon.aws.ec2_key_info:
         region: "{{ aws_region }}"
-        state: present
-      register: keys_check
-      ignore_errors: yes
-      with_items:
-        - "{{ redirector_name }}"
-        - "{{ c2_name }}"
-        - "{{ tracker_name }}"
-        
-    - name: Delete key pairs
+      register: all_key_pairs
+
+    - name: Delete deployment related key pairs
       amazon.aws.ec2_key:
-        name: "{{ item.invocation.module_args.name }}"
+        name: "{{ item.key_name }}"
         region: "{{ aws_region }}"
         state: absent
-      loop: "{{ keys_check.results }}"
-      when: keys_check.results | length > 0 and item.failed is not defined and item.key is defined
-      register: deleted_keys
+      loop: "{{ all_key_pairs.key_pairs | selectattr('key_name', 'search', deployment_id) | list }}"
+      when: all_key_pairs.key_pairs | length > 0
       
-    - name: Count deleted keys
-      set_fact:
-        cleanup_summary: "{{ cleanup_summary | combine({
-          'keypairs_deleted': (deleted_keys.results | default([]) | selectattr('changed', 'defined') | selectattr('changed') | list | length)}) }}"
-        
     # Add this after your existing key pair finding task
     - name: Find c2deploy key pairs
       amazon.aws.ec2_key: