cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'vpc_fix' of https://github.com/ebrevdo/ansible into ebrevdo-vpc_fix

Browse source
This commit is contained in:
James Cammarata 2014-05-08 14:39:07 -05:00
commit 768de238d4
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
library/cloud/rds
View file

@ -465,7 +465,9 @@ def main():
params["security_groups"] = security_groups.split(',') params["security_groups"] = security_groups.split(',')
if vpc_security_groups: if vpc_security_groups:
params["vpc_security_groups"] = vpc_security_groups.split(',') params["vpc_security_groups"] = [
boto.rds.VPCSecurityGroupMembership(vpc_group=x) if x else None
for x in vpc_security_groups.split(',')]
if new_instance_name: if new_instance_name:
params["new_instance_id"] = new_instance_name params["new_instance_id"] = new_instance_name
@ -618,9 +620,14 @@ def main():
if resource.status == 'available' and command != 'snapshot': if resource.status == 'available' and command != 'snapshot':
d["endpoint"] = resource.endpoint[0] d["endpoint"] = resource.endpoint[0]
d["port"] = resource.endpoint[1] d["port"] = resource.endpoint[1]
if resource.vpc_security_groups is not None:
d["vpc_security_groups"] = ','.join(x.vpc_group for x in resource.vpc_security_groups)
else:
d["vpc_security_groups"] = None
else: else:
d["endpoint"] = None d["endpoint"] = None
d["port"] = None d["port"] = None
d["vpc_security_groups"] = None
# ReadReplicaSourceDBInstanceIdentifier may or may not exist # ReadReplicaSourceDBInstanceIdentifier may or may not exist
try: try: