From 4017be741a259d516d24ce1588cdcc7ddf28ea8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Moser?= Date: Tue, 30 Aug 2016 23:38:07 +0200 Subject: [PATCH] ec2_vpc_dhcp_options_facts: fix exception handling, fixes build (#2819) --- .../extras/cloud/amazon/ec2_vpc_dhcp_options_facts.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/ansible/modules/extras/cloud/amazon/ec2_vpc_dhcp_options_facts.py b/lib/ansible/modules/extras/cloud/amazon/ec2_vpc_dhcp_options_facts.py index 8c59aeb5c9..a60a210489 100644 --- a/lib/ansible/modules/extras/cloud/amazon/ec2_vpc_dhcp_options_facts.py +++ b/lib/ansible/modules/extras/cloud/amazon/ec2_vpc_dhcp_options_facts.py @@ -81,7 +81,7 @@ import json try: import botocore - import boto3 + import boto3 HAS_BOTO3 = True except ImportError: HAS_BOTO3 = False @@ -128,7 +128,7 @@ def list_dhcp_options(client, module): snaked_dhcp_options_array = [] for dhcp_option in all_dhcp_options_array: snaked_dhcp_options_array.append(camel_dict_to_snake_dict(dhcp_option)) - + module.exit_json(dhcp_options=snaked_dhcp_options_array) @@ -151,12 +151,12 @@ def main(): try: 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) - except botocore.exceptions.NoCredentialsError, e: + except botocore.exceptions.NoCredentialsError as e: module.fail_json(msg="Can't authorize connection - "+str(e)) # call your function here results = list_dhcp_options(connection, module) - + module.exit_json(result=results) # import module snippets