Merge pull request #5603 from willthames/ec2_keypair_not_mandatory

key_name is not required when creating ec2 instances
This commit is contained in:
jctanner 2014-01-23 17:06:23 -08:00
commit b5baff8f2f

View file

@ -25,7 +25,7 @@ options:
key_name: key_name:
description: description:
- key pair to use on the instance - key pair to use on the instance
required: true required: false
default: null default: null
aliases: ['keypair'] aliases: ['keypair']
id: id:
@ -655,8 +655,6 @@ def main():
elif module.params.get('state') == 'present': elif module.params.get('state') == 'present':
# Changed is always set to true when provisioning new instances # Changed is always set to true when provisioning new instances
if not module.params.get('key_name'):
module.fail_json(msg='key_name parameter is required for new instance')
if not module.params.get('image'): if not module.params.get('image'):
module.fail_json(msg='image parameter is required for new instance') module.fail_json(msg='image parameter is required for new instance')
(instance_dict_array, new_instance_ids, changed) = create_instances(module, ec2) (instance_dict_array, new_instance_ids, changed) = create_instances(module, ec2)