internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-07 05:42:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'rdsfixes' of https://github.com/jamespharaoh/ansible into jamespharaoh-rdsfixes

Browse Source
This commit is contained in:
James Cammarata
2013-09-05 23:47:32 -05:00
parent ae9e38daf8 137a32ca36
commit 84c977258f
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
library/cloud/rds
View File

@@ -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)
@@ -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':