diff options
| author | Matt Martz <matt@sivel.net> | 2016-05-07 07:36:41 -0500 |
|---|---|---|
| committer | Matt Martz <matt@sivel.net> | 2016-05-07 07:36:41 -0500 |
| commit | a4b631522dcb02d919b0774a71fefc627013f0f5 (patch) | |
| tree | 739d73a3b577c6b564a13f9e3ba144563e2634f5 | |
| parent | 431591c2b45f28ac4033e04953d8ecfc360ba575 (diff) | |
| parent | 61b9b48c608c5ef816e2394ef5bd790e165e5134 (diff) | |
| download | ansible-modules-extras-a4b631522dcb02d919b0774a71fefc627013f0f5.tar.gz | |
Merge pull request #2179 from sivel/ansible-testing-exclusions
Ansible testing exclusions
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | cloud/amazon/ec2_ami_copy.py | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 74e75708..70defe5a 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|database/influxdb/influxdb.*\.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 . #- ./test-docs.sh extras diff --git a/cloud/amazon/ec2_ami_copy.py b/cloud/amazon/ec2_ami_copy.py index 49afed7b..72c804bc 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: |