[ec2] Use user_data if specified (ansible#54494)

* Use user_data if specified * changelog
dmp1ce · Apr 9, 2019 · ba8b5ec · ba8b5ec
1 parent d53c3cd
commit ba8b5ec
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/changelogs/fragments/54494-ec2-user-data.yaml b/changelogs/fragments/54494-ec2-user-data.yaml
@@ -0,0 +1,3 @@
+bugfixes:
+  - ec2 - Only use user_data if the user has specified a value.
+    This prevents setting the instance's user data to b'None'.
diff --git a/lib/ansible/modules/cloud/amazon/ec2.py b/lib/ansible/modules/cloud/amazon/ec2.py
@@ -1070,8 +1070,9 @@ def create_instances(module, ec2, vpc, override_count=None):
                       'placement': zone,
                       'instance_type': instance_type,
                       'kernel_id': kernel,
-                      'ramdisk_id': ramdisk,
-                      'user_data': to_bytes(user_data, errors='surrogate_or_strict')}
+                      'ramdisk_id': ramdisk}
+            if user_data is not None:
+                params['user_data'] = to_bytes(user_data, errors='surrogate_or_strict')
 
             if ebs_optimized:
                 params['ebs_optimized'] = ebs_optimized