From e759b4d0ebf167fba0dd34e8a6b54cf11a444e7c Mon Sep 17 00:00:00 2001
From: Lorin Hochstein <lorin.hochstein@sendgrid.com>
Date: Sun, 16 Nov 2014 13:48:39 -0500
Subject: [PATCH 1/2] ec2 module: add instance_id alias

Create an alias named instance_id for the instance_ids parameter.
---
 cloud/amazon/ec2.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cloud/amazon/ec2.py b/cloud/amazon/ec2.py
index 10791439556..7286cb0bc0a 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', alias='instance_id'),
             source_dest_check = dict(type='bool', default=True),
             state = dict(default='present'),
             exact_count = dict(type='int', default=None),

From ea4d5798c7bd8d2d02a477b5d0cde301a124f30f Mon Sep 17 00:00:00 2001
From: Lorin Hochstein <lorin.hochstein@sendgrid.com>
Date: Sun, 16 Nov 2014 14:00:18 -0500
Subject: [PATCH 2/2] Use the correct alias syntax

---
 cloud/amazon/ec2.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cloud/amazon/ec2.py b/cloud/amazon/ec2.py
index 7286cb0bc0a..a69c94f1eee 100755
--- a/cloud/amazon/ec2.py
+++ b/cloud/amazon/ec2.py
@@ -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', alias='instance_id'),
+            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),