summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Coca <bcoca@ansible.com>2015-03-30 08:49:07 -0400
committerBrian Coca <bcoca@ansible.com>2015-03-30 08:49:07 -0400
commit1865ddbbdf1e8fa312c26b613fd28a98151023d1 (patch)
treeb35f5a0936c01d90744efbb8bcede021337bf51e
parente94956d39d1d6e78eb4e4d44a63d91ef19e98f93 (diff)
parentea4d5798c7bd8d2d02a477b5d0cde301a124f30f (diff)
downloadansible-modules-core-1865ddbbdf1e8fa312c26b613fd28a98151023d1.tar.gz
Merge pull request #339 from lorin/instance_id
ec2 module: add instance_id alias
-rwxr-xr-xcloud/amazon/ec2.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/cloud/amazon/ec2.py b/cloud/amazon/ec2.py
index 10791439..a69c94f1 100755
--- a/cloud/amazon/ec2.py
+++ b/cloud/amazon/ec2.py
@@ -179,7 +179,7 @@ options:
- "list of instance ids, currently used for states: absent, running, stopped"
required: false
default: null
- aliases: []
+ aliases: ['instance_id']
source_dest_check:
version_added: "1.6"
description:
@@ -1183,7 +1183,7 @@ def main():
assign_public_ip = dict(type='bool', default=False),
private_ip = dict(),
instance_profile_name = dict(),
- instance_ids = dict(type='list'),
+ instance_ids = dict(type='list', aliases=['instance_id']),
source_dest_check = dict(type='bool', default=True),
state = dict(default='present'),
exact_count = dict(type='int', default=None),