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

ec2 module fixes for 'make pep8'

Browse source
This commit is contained in:
Michael DeHaan 2013-05-11 17:20:09 -04:00
parent 539aa02de3
commit 58aad8c6e8
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cloud/ec2
View file

@ -263,9 +263,9 @@ def main():
# If we have a region specified, connect to its endpoint. # If we have a region specified, connect to its endpoint.
if region: if region:
try: try:
ec2 = boto.ec2.connect_to_region(region, aws_access_key_id=ec2_access_key, aws_secret_access_key=ec2_secret_key) ec2 = boto.ec2.connect_to_region(region, aws_access_key_id=ec2_access_key, aws_secret_access_key=ec2_secret_key)
except boto.exception.NoAuthHandlerFound, e: except boto.exception.NoAuthHandlerFound, e:
module.fail_json(msg = str(e)) module.fail_json(msg = str(e))
# Otherwise, no region so we fallback to the old connection method # Otherwise, no region so we fallback to the old connection method
else: else:
try: try:
@ -329,9 +329,9 @@ def main():
'user_data': user_data} 'user_data': user_data}
if vpc_subnet_id: if vpc_subnet_id:
params['security_group_ids'] = [group_id] params['security_group_ids'] = [group_id]
else: else:
params['security_groups'] = [group_name] params['security_groups'] = [group_name]
res = ec2.run_instances(**params) res = ec2.run_instances(**params)
except boto.exception.BotoServerError, e: except boto.exception.BotoServerError, e: