[manual backport stable-5] Pick up app_callback -> set_password rathe…

…r than app_callback -> set_passwd (ansible-collections#1482)

[manual backport stable-5] Pick up app_callback -> set_password rather than app_callback -> set_passwd

Pick up app_callback -> set_password rather than app_callback -> set_passwd
SUMMARY
Closes: ansible-collections#1449
Pick up app_callback -> set_password rather than app_callback -> set_passwd
ISSUE TYPE
Bugfix Pull Request
Docs Pull Request
Feature Pull Request
New Module Pull Request
COMPONENT NAME
ADDITIONAL INFORMATION
Reviewed-by: Mark Chappell
SUMMARY


ISSUE TYPE


Bugfix Pull Request
Docs Pull Request
Feature Pull Request
New Module Pull Request

COMPONENT NAME

ADDITIONAL INFORMATION

Reviewed-by: Mark Chappell
Reviewed-by: Jill R

changelogs/fragments/1258-ec2_instance.yml

@@ -0,0 +1,2 @@
+trivial:
+- ec2_instance - changes to integration tests to fix failures

changelogs/fragments/20230424-ec2_instance-app_callback.yml

@@ -0,0 +1,2 @@
+bugfixes:
+- ec2_instance - Pick up ``app_callback -> set_password`` rather than ``app_callback -> set_passwd`` (https://github.com/ansible-collections/amazon.aws/issues/1449).

plugins/modules/ec2_instance.py

@@ -1226,11 +1226,11 @@ def build_userdata(params):
         return {'UserData': to_native(params.get('user_data'))}
     if params.get('aap_callback'):
         userdata = tower_callback_script(
-            tower_address=params.get('aap_callback').get('tower_address'),
-            job_template_id=params.get('aap_callback').get('job_template_id'),
-            host_config_key=params.get('aap_callback').get('host_config_key'),
-            windows=params.get('aap_callback').get('windows'),
-            passwd=params.get('aap_callback').get('set_passwd'),
+            tower_address=params.get("aap_callback").get("tower_address"),
+            job_template_id=params.get("aap_callback").get("job_template_id"),
+            host_config_key=params.get("aap_callback").get("host_config_key"),
+            windows=params.get("aap_callback").get("windows"),
+            passwd=params.get("aap_callback").get("set_password"),
         )
         return {'UserData': userdata}
     return {}

tests/integration/targets/ec2_instance_block_devices/defaults/main.yml

@@ -1,4 +1,4 @@
 ---
-# defaults file for ec2_instance
+# defaults file for ec2_instance_block_devices
 ec2_instance_type: 't3.micro'
 ec2_instance_tag_TestId: '{{ resource_prefix }}-block-devices'

tests/integration/targets/ec2_instance_checkmode_tests/defaults/main.yml

@@ -1,4 +1,4 @@
 ---
-# defaults file for ec2_instance
+# defaults file for ec2_instance_checkmode_tests
 ec2_instance_type: 't3.micro'
 ec2_instance_tag_TestId: '{{ resource_prefix }}-instance-checkmode'

tests/integration/targets/ec2_instance_cpu_options/defaults/main.yml

@@ -1,4 +1,4 @@
 ---
-# defaults file for ec2_instance
+# defaults file for ec2_instance_cpu_options
 ec2_instance_type: 't3.micro'
 ec2_instance_tag_TestId: '{{ resource_prefix }}-cpu-options'

tests/integration/targets/ec2_instance_default_vpc_tests/defaults/main.yml

@@ -1,4 +1,4 @@
 ---
-# defaults file for ec2_instance
+# defaults file for ec2_instance_default_vpc
 ec2_instance_type: 't3.micro'
 ec2_instance_tag_TestId: '{{ resource_prefix }}-default-vpc'

tests/integration/targets/ec2_instance_ebs_optimized/defaults/main.yml

@@ -1,4 +1,4 @@
 ---
-# defaults file for ec2_instance
+# defaults file for ec2_instance_ebs_optimized
 ec2_instance_type: 't3.micro'
 ec2_instance_tag_TestId: '{{ resource_prefix }}-ebs-optimized'

tests/integration/targets/ec2_instance_external_resource_attach/defaults/main.yml

@@ -1,4 +1,4 @@
 ---
-# defaults file for ec2_instance
+# defaults file for ec2_instance_external_resource_attach
 ec2_instance_type: 't3.micro'
 ec2_instance_tag_TestId: '{{ resource_prefix }}-external-attach'

tests/integration/targets/ec2_instance_hibernation_options/defaults/main.yml

@@ -1,4 +1,4 @@
 ---
-# defaults file for ec2_instance
+# defaults file for ec2_instance_hibernation_options
 ec2_instance_type: 't3.micro'
 ec2_instance_tag_TestId: '{{ resource_prefix }}-instance-hibernation-options'

tests/integration/targets/ec2_instance_iam_instance_role/defaults/main.yml

@@ -1,5 +1,5 @@
 ---
-# defaults file for ec2_instance
+# defaults file for ec2_instance_iam_instance_profile
 ec2_instance_type: 't3.micro'
 ec2_instance_tag_TestId: '{{ resource_prefix }}-instance-profile'
 

tests/integration/targets/ec2_instance_instance_minimal/defaults/main.yml

@@ -1,4 +1,4 @@
 ---
-# defaults file for ec2_instance
+# defaults file for ec2_instance_minimal
 ec2_instance_type: 't3.micro'
 ec2_instance_tag_TestId: '{{ resource_prefix }}-instance-minimal'

tests/integration/targets/ec2_instance_instance_multiple/defaults/main.yml

@@ -1,4 +1,4 @@
 ---
-# defaults file for ec2_instance
+# defaults file for ec2_instance_multiple
 ec2_instance_type: 't3.micro'
 ec2_instance_tag_TestId: '{{ resource_prefix }}-instance-multiple'

tests/integration/targets/ec2_instance_instance_no_wait/defaults/main.yml

@@ -1,4 +1,4 @@
 ---
-# defaults file for ec2_instance
+# defaults file for ec2_instance_no_wait
 ec2_instance_type: 't3.micro'
 ec2_instance_tag_TestId: '{{ resource_prefix }}-instance-no-wait'

tests/integration/targets/ec2_instance_metadata_options/defaults/main.yml

@@ -1,4 +1,4 @@
 ---
-# defaults file for ec2_instance
+# defaults file for ec2_instance_metadata_options
 ec2_instance_type: 't3.micro'
 ec2_instance_tag_TestId: '{{ resource_prefix }}-instance-metadata'

tests/integration/targets/ec2_instance_security_group/defaults/main.yml

@@ -1,4 +1,4 @@
 ---
-# defaults file for ec2_instance
+# defaults file for ec2_instance_security_group
 ec2_instance_type: 't3.micro'
 ec2_instance_tag_TestId: '{{ resource_prefix }}-instance-sg'

tests/integration/targets/ec2_instance_state_config_updates/defaults/main.yml

@@ -1,4 +1,4 @@
 ---
-# defaults file for ec2_instance
+# defaults file for ec2_instance_state_config_updates
 ec2_instance_type: 't3.micro'
 ec2_instance_tag_TestId: '{{ resource_prefix }}-state-config-updates'

tests/integration/targets/ec2_instance_tags_and_vpc_settings/defaults/main.yml

@@ -1,4 +1,4 @@
 ---
-# defaults file for ec2_instance
+# defaults file for ec2_instance_tags_and_vpc_settings
 ec2_instance_type: 't3.micro'
 ec2_instance_tag_TestId: '{{ resource_prefix }}-instance-tags-vpc'

tests/integration/targets/ec2_instance_termination_protection/defaults/main.yml

@@ -1,4 +1,4 @@
 ---
-# defaults file for ec2_instance
+# defaults file for ec2_instance_termination_protection
 ec2_instance_type: 't3.micro'
 ec2_instance_tag_TestId: '{{ resource_prefix }}-instance-temination'

tests/integration/targets/ec2_instance_uptime/defaults/main.yml

@@ -1,4 +1,4 @@
 ---
-# defaults file for ec2_instance
+# defaults file for ec2_instance_uptime
 ec2_instance_type: 't3.micro'
 ec2_instance_tag_TestId: '{{ resource_prefix }}-instance-uptime'

tests/integration/targets/ec2_snapshot/tasks/main.yml

@@ -233,12 +233,12 @@
         # Anything under 15 will trigger SnapshotCreationPerVolumeRateExceeded,
         # this should now be automatically handled, but pause a little anyway to
         # avoid being aggressive
-        pause: 10
+        pause: 15
         label: "Generate extra snapshots - {{ item }}"
 
     - name: Pause to allow creation to finish
       pause:
-        minutes: 2
+        minutes: 3
 
     # check that snapshot_ids and max_results are mutually exclusive
     - name: Check that max_results and snapshot_ids are mutually exclusive

tests/integration/targets/setup_ec2_instance_env/defaults/main.yml

@@ -1,11 +1,11 @@
 ---
-# defaults file for ec2_instance
-ec2_instance_owner: 'integration-run-{{ resource_prefix }}'
-ec2_instance_type: 't3.micro'
-ec2_instance_tag_TestId: '{{ resource_prefix }}-{{ inventory_hostname }}'
-
+# defaults file for ec2_instance tests
 ec2_instance_test_name: 'ec2_instance'
 
+ec2_instance_owner: 'integration-run-{{ ec2_instance_test_name }}'
+ec2_instance_type: 't3.micro'
+ec2_instance_tag_TestId: '{{ resource_prefix }}-{{ ec2_instance_test_name }}'
+
 vpc_name: '{{ resource_prefix }}-{{ ec2_instance_test_name }}'
 vpc_seed: '{{ resource_prefix }}-{{ ec2_instance_test_name }}'
 
@@ -14,6 +14,11 @@ vpc_cidr: '10.{{ 256 | random(seed=vpc_seed) }}.0.0/16'
 subnet_a_az: '{{ ec2_availability_zone_names[0] }}'
 subnet_a_cidr: '10.{{ 256 | random(seed=vpc_seed) }}.32.0/24'
 subnet_a_startswith: '10.{{ 256 | random(seed=vpc_seed) }}.32.'
+subnet_a_name: '{{ resource_prefix }}-{{ ec2_instance_test_name }}-a'
 subnet_b_az: '{{ ec2_availability_zone_names[1] }}'
 subnet_b_cidr: '10.{{ 256 | random(seed=vpc_seed) }}.33.0/24'
 subnet_b_startswith: '10.{{ 256 | random(seed=vpc_seed) }}.33.'
+subnet_b_name: '{{ resource_prefix }}-{{ ec2_instance_test_name }}-b'
+
+security_group_name_1: '{{ resource_prefix }}-{{ ec2_instance_test_name }}-1'
+security_group_name_2: '{{ resource_prefix }}-{{ ec2_instance_test_name }}-2'

tests/integration/targets/setup_ec2_instance_env/tasks/main.yml

@@ -12,7 +12,7 @@
       name: "{{ vpc_name }}"
       cidr_block: "{{ vpc_cidr }}"
       tags:
-        Name: Ansible ec2_instance Testing VPC
+        Name: "{{ vpc_name }}"
       tenancy: default
     register: testing_vpc
     notify:
@@ -25,7 +25,7 @@
       cidr: "{{ subnet_a_cidr }}"
       az: "{{ subnet_a_az }}"
       resource_tags:
-        Name: "{{ resource_prefix }}-subnet-a"
+        Name: "{{ subnet_a_name }}"
     register: testing_subnet_a
 
   - name: "Create secondary subnet in zone B"
@@ -35,13 +35,13 @@
       cidr: "{{ subnet_b_cidr }}"
       az: "{{ subnet_b_az }}"
       resource_tags:
-        Name: "{{ resource_prefix }}-subnet-b"
+        Name: "{{ subnet_b_name }}"
     register: testing_subnet_b
 
   - name: "create a security group with the vpc"
     ec2_group:
       state: present
-      name: "{{ resource_prefix }}-sg"
+      name: "{{ security_group_name_1 }}"
       description: a security group for ansible tests
       vpc_id: "{{ testing_vpc.vpc.id }}"
       rules:
@@ -57,7 +57,7 @@
 
   - name: "create secondary security group with the vpc"
     ec2_group:
-      name: "{{ resource_prefix }}-sg-2"
+      name: "{{ security_group_name_2 }}"
       description: a secondary security group for ansible tests
       vpc_id: "{{ testing_vpc.vpc.id }}"
       rules:
@@ -70,3 +70,19 @@
           to_port: 80
           cidr_ip: 0.0.0.0/0
     register: sg2
+
+  - name: Preserve defaults for other roles
+    set_fact:
+      # Ensure variables are available outside of this role
+      vpc_cidr: '{{ vpc_cidr }}'
+      vpc_name: '{{ vpc_name }}'
+      subnet_a_az: '{{ subnet_a_az }}'
+      subnet_a_cidr: '{{ subnet_a_cidr }}'
+      subnet_a_startswith: '{{ subnet_a_startswith }}'
+      subnet_a_name: '{{ subnet_a_name }}'
+      subnet_b_az: '{{ subnet_b_az }}'
+      subnet_b_cidr: '{{ subnet_b_cidr }}'
+      subnet_b_startswith: '{{ subnet_b_startswith }}'
+      subnet_b_name: '{{ subnet_b_name }}'
+      security_group_name_1: '{{ security_group_name_1 }}'
+      security_group_name_2: '{{ security_group_name_2 }}'