From b831e803ac78f6c0b4c695507eff6352e816b776 Mon Sep 17 00:00:00 2001 From: lwade Date: Sat, 23 Feb 2013 17:45:47 +0000 Subject: [PATCH 1/2] Adding VPC subnet ID support --- ec2 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/ec2 b/ec2 index 5070f8c1364..72544d8c314 100644 --- a/ec2 +++ b/ec2 @@ -116,6 +116,13 @@ options: required: false default: null aliases: [] + subnet_id: + version_added: "1.1" + description: + - the subnet ID in which to launch the instance (VPC) + required: false + default: null + aliases: [] examples: - code: 'local_action: ec2 keypair=admin instance_type=m1.large image=emi-40603AD1 wait=true group=webserver count=3 group=webservers' description: "Examples from Ansible Playbooks" @@ -150,6 +157,7 @@ def main(): ec2_access_key = dict(aliases=['EC2_ACCESS_KEY']), user_data = dict(), instance_tags = dict(), + vpc_subnet_id = dict(), ) ) @@ -168,6 +176,7 @@ def main(): ec2_access_key = module.params.get('ec2_access_key') user_data = module.params.get('user_data') instance_tags = module.params.get('instance_tags') + vpc_subnet_id = module.params.get('vpc_subnet_id') # allow eucarc environment variables to be used if ansible vars aren't set if not ec2_url and 'EC2_URL' in os.environ: @@ -206,6 +215,7 @@ def main(): instance_type = instance_type, kernel_id = kernel, ramdisk_id = ramdisk, + subnet_id = vpc_subnet_id, user_data = user_data) except boto.exception.BotoServerError, e: module.fail_json(msg = "%s: %s" % (e.error_code, e.error_message)) From 55ac38f2f6b1abb5b60c7b21f80c55f1f8b434d9 Mon Sep 17 00:00:00 2001 From: lwade Date: Sat, 23 Feb 2013 17:46:35 +0000 Subject: [PATCH 2/2] missed a spot. --- ec2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ec2 b/ec2 index 72544d8c314..1258d308eca 100644 --- a/ec2 +++ b/ec2 @@ -116,7 +116,7 @@ options: required: false default: null aliases: [] - subnet_id: + vpc_subnet_id: version_added: "1.1" description: - the subnet ID in which to launch the instance (VPC)