Backport ansible-collections#1468

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
alinabuzachis · May 3, 2023 · 2656b24 · 2656b24
1 parent 4178e9a
commit 2656b24
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/changelogs/fragments/20230424-ec2_instance-app_callback.yml b/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).
diff --git a/plugins/modules/ec2_instance.py b/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 {}
Original file line number	Diff line number	Diff line change
		@@ -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).