From dca0d4a08cda856437f7c2c2768e443fa1791311 Mon Sep 17 00:00:00 2001 From: Mark Chance Date: Thu, 10 Sep 2015 08:25:34 -0600 Subject: [PATCH] update version, fix fail msgs --- cloud/amazon/ecs_taskdefinition.py | 4 ++-- cloud/amazon/ecs_taskdefinition_facts.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cloud/amazon/ecs_taskdefinition.py b/cloud/amazon/ecs_taskdefinition.py index 9915e9d8070..70bf59f7b6d 100644 --- a/cloud/amazon/ecs_taskdefinition.py +++ b/cloud/amazon/ecs_taskdefinition.py @@ -20,7 +20,7 @@ module: ecs_taskdefinition short_description: register a task definition in ecs description: - Creates or terminates task definitions -version_added: "1.9" +version_added: "2.0" requirements: [ json, boto, botocore, boto3 ] options: state: @@ -114,7 +114,7 @@ class EcsTaskManager: module.fail_json(msg="Region must be specified as a parameter, in EC2_REGION or AWS_REGION environment variables or in boto configuration file") self.ecs = boto3_conn(module, conn_type='client', resource='ecs', region=region, endpoint=ec2_url, **aws_connect_kwargs) except boto.exception.NoAuthHandlerFound, e: - self.module.fail_json(msg=str(e)) + self.module.fail_json(msg="Can't authorize connection - "+str(e)) def describe_task(self, task_name): try: diff --git a/cloud/amazon/ecs_taskdefinition_facts.py b/cloud/amazon/ecs_taskdefinition_facts.py index c351639513f..d99f563aeb6 100644 --- a/cloud/amazon/ecs_taskdefinition_facts.py +++ b/cloud/amazon/ecs_taskdefinition_facts.py @@ -20,7 +20,7 @@ module: ecs_taskdefinition_facts short_description: return facts about task definitions in ecs description: - Describes or lists task definitions. -version_added: 1.9 +version_added: 2.0 requirements: [ json, os, boto, botocore, boto3 ] options: details: @@ -105,7 +105,7 @@ class EcsTaskManager: module.fail_json(msg="Region must be specified as a parameter, in EC2_REGION or AWS_REGION environment variables or in boto configuration file") self.ecs = boto3_conn(module, conn_type='client', resource='ecs', region=region, endpoint=ec2_url, **aws_connect_kwargs) except boto.exception.NoAuthHandlerFound, e: - self.module.fail_json(msg=str(e)) + self.module.fail_json(msg="Can't authorize connection - "+str(e)) def transmogrify(self, params, field, dictionary, arg_name): if field in params and params[field] is not None: