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

Merge pull request #254 from SDFE/ec2_vpc_connect_params

Browse source 
use simpler ec2_connect ec2 util call
This commit is contained in:
Brian Coca 2015-03-26 14:17:27 -04:00
commit 68daec05f2
1 changed files with 1 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
cloud/amazon/ec2_vpc.py
View file

@ -599,20 +599,7 @@ def main():
state = module.params.get('state')
ec2_url, aws_access_key, aws_secret_key, region = get_ec2_creds(module)
# If we have a region specified, connect to its endpoint.
if region:
try:
vpc_conn = boto.vpc.connect_to_region(
region,
aws_access_key_id=aws_access_key,
aws_secret_access_key=aws_secret_key
)
except boto.exception.NoAuthHandlerFound, e:
module.fail_json(msg = str(e))
else:
module.fail_json(msg="region must be specified")
vpc_conn = ec2_connect(module)
if module.params.get('state') == 'absent':
vpc_id = module.params.get('vpc_id')