From 866090efb148dca40f08bec345b6b62f0e340428 Mon Sep 17 00:00:00 2001 From: James Pharaoh Date: Mon, 2 Sep 2013 20:37:53 +0200 Subject: [PATCH 1/2] fix for rds region variable --- cloud/rds | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cloud/rds b/cloud/rds index 99b0fb5446e..77746026d3c 100644 --- a/cloud/rds +++ b/cloud/rds @@ -349,12 +349,12 @@ def main(): elif 'EC2_ACCESS_KEY' in os.environ: aws_access_key = os.environ['EC2_ACCESS_KEY'] - if not aws_region: + if not region: module.fail_json(msg = str("region not specified and unable to determine region from EC2_REGION.")) # connect to the rds endpoint try: - conn = boto.rds.connect_to_region(aws_region, aws_access_key_id=aws_access_key, aws_secret_access_key=aws_secret_key) + conn = boto.rds.connect_to_region(region, aws_access_key_id=aws_access_key, aws_secret_access_key=aws_secret_key) except boto.exception.BotoServerError, e: module.fail_json(msg = e.error_message) From b9c602ea83d1fb936d7a2dd8bcbe06b9084b9674 Mon Sep 17 00:00:00 2001 From: James Pharaoh Date: Mon, 2 Sep 2013 20:38:06 +0200 Subject: [PATCH 2/2] make rds handle vpc security groups properly --- cloud/rds | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cloud/rds b/cloud/rds index 77746026d3c..cf937ef57a4 100644 --- a/cloud/rds +++ b/cloud/rds @@ -438,7 +438,10 @@ def main(): params["iops"] = iops if security_groups: - params["security_groups"] = security_groups.split(',') + if subnet: + params["vpc_security_groups"] = security_groups.split(',') + else: + params["security_groups"] = security_groups.split(',') try: if command == 'create':