Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

key_name is not required when creating ec2 instances #5603

Merged
merged 1 commit into from
Jan 24, 2014
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 1 addition & 3 deletions library/cloud/ec2
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ options:
key_name:
description:
- key pair to use on the instance
required: true
required: false
default: null
aliases: ['keypair']
id:
Expand Down Expand Up @@ -655,8 +655,6 @@ def main():

elif module.params.get('state') == 'present':
# 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'):
module.fail_json(msg='image parameter is required for new instance')
(instance_dict_array, new_instance_ids, changed) = create_instances(module, ec2)
Expand Down