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

ec2_vpc_dhcp_options_facts: fix exception handling, fixes build (#2819)

Browse source
This commit is contained in:
René Moser 2016-08-30 23:38:07 +02:00 committed by GitHub
parent 2c78dea646
commit 1c4f346691
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/amazon/ec2_vpc_dhcp_options_facts.py
View file

@ -81,7 +81,7 @@ import json
try: try:
import botocore import botocore
import boto3 import boto3
HAS_BOTO3 = True HAS_BOTO3 = True
except ImportError: except ImportError:
HAS_BOTO3 = False HAS_BOTO3 = False
@ -128,7 +128,7 @@ def list_dhcp_options(client, module):
snaked_dhcp_options_array = [] snaked_dhcp_options_array = []
for dhcp_option in all_dhcp_options_array: for dhcp_option in all_dhcp_options_array:
snaked_dhcp_options_array.append(camel_dict_to_snake_dict(dhcp_option)) snaked_dhcp_options_array.append(camel_dict_to_snake_dict(dhcp_option))
module.exit_json(dhcp_options=snaked_dhcp_options_array) module.exit_json(dhcp_options=snaked_dhcp_options_array)
@ -151,12 +151,12 @@ def main():
try: try:
region, ec2_url, aws_connect_kwargs = get_aws_connection_info(module, boto3=True) region, ec2_url, aws_connect_kwargs = get_aws_connection_info(module, boto3=True)
connection = boto3_conn(module, conn_type='client', resource='ec2', region=region, endpoint=ec2_url, **aws_connect_kwargs) connection = boto3_conn(module, conn_type='client', resource='ec2', region=region, endpoint=ec2_url, **aws_connect_kwargs)
except botocore.exceptions.NoCredentialsError, e: except botocore.exceptions.NoCredentialsError as e:
module.fail_json(msg="Can't authorize connection - "+str(e)) module.fail_json(msg="Can't authorize connection - "+str(e))
# call your function here # call your function here
results = list_dhcp_options(connection, module) results = list_dhcp_options(connection, module)
module.exit_json(result=results) module.exit_json(result=results)
# import module snippets # import module snippets