From b4de5ec2084f501e1aa8558acd26a4753c494c80 Mon Sep 17 00:00:00 2001 From: Matt Martz Date: Fri, 6 May 2016 14:00:07 -0500 Subject: [PATCH 1/3] Reduce exclusions for ansible-testing due to fixes and changes in ansible-testing --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 00811615031..c210c071943 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,5 +20,5 @@ script: - python2.4 -m compileall -fq -x 'cloud/|monitoring/zabbix.*\.py|/dnf\.py|/layman\.py|/maven_artifact\.py|clustering/(consul.*|znode)\.py|notification/pushbullet\.py' . - python2.6 -m compileall -fq . - python2.7 -m compileall -fq . - - ansible-validate-modules --exclude 'cloud/cloudstack/cs_template\.py|cloud/centurylink/clc_aa_policy\.py|cloud/centurylink/clc_alert_policy\.py|cloud/centurylink/clc_blueprint_package\.py|cloud/centurylink/clc_firewall_policy\.py|cloud/centurylink/clc_group\.py|cloud/centurylink/clc_loadbalancer\.py|cloud/centurylink/clc_modify_server\.py|cloud/centurylink/clc_publicip\.py|cloud/centurylink/clc_server\.py|cloud/centurylink/clc_server_snapshot\.py|cloud/docker/docker_login\.py|messaging/rabbitmq_binding\.py|messaging/rabbitmq_exchange\.py|messaging/rabbitmq_queue\.py|monitoring/circonus_annotation\.py|network/snmp_facts\.py|notification/sns\.py|cloud/cloudstack/cs_template\.py' . + - ansible-validate-modules --exclude 'cloud/cloudstack/cs_template\.py' . #- ./test-docs.sh extras From 081845b35350dd99f31c3750d9d3769a556f6946 Mon Sep 17 00:00:00 2001 From: Matt Martz Date: Fri, 6 May 2016 14:00:32 -0500 Subject: [PATCH 2/3] Fix HAS_BOTO fail_json call for ec2_ami_copy --- cloud/amazon/ec2_ami_copy.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cloud/amazon/ec2_ami_copy.py b/cloud/amazon/ec2_ami_copy.py index 49afed7bf98..72c804bc1d1 100644 --- a/cloud/amazon/ec2_ami_copy.py +++ b/cloud/amazon/ec2_ami_copy.py @@ -88,9 +88,6 @@ try: HAS_BOTO = True except ImportError: HAS_BOTO = False - -if not HAS_BOTO: - module.fail_json(msg='boto required for this module') def copy_image(module, ec2): """ @@ -180,6 +177,9 @@ def main(): module = AnsibleModule(argument_spec=argument_spec) + if not HAS_BOTO: + module.fail_json(msg='boto required for this module') + try: ec2 = ec2_connect(module) except boto.exception.NoAuthHandlerFound, e: From 61b9b48c608c5ef816e2394ef5bd790e165e5134 Mon Sep 17 00:00:00 2001 From: Matt Martz Date: Fri, 6 May 2016 14:02:23 -0500 Subject: [PATCH 3/3] No exclusions necessary --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c210c071943..1edbffdbd8d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,5 +20,5 @@ script: - python2.4 -m compileall -fq -x 'cloud/|monitoring/zabbix.*\.py|/dnf\.py|/layman\.py|/maven_artifact\.py|clustering/(consul.*|znode)\.py|notification/pushbullet\.py' . - python2.6 -m compileall -fq . - python2.7 -m compileall -fq . - - ansible-validate-modules --exclude 'cloud/cloudstack/cs_template\.py' . + - ansible-validate-modules . #- ./test-docs.sh extras