ec2_vpc - Fail module using fail_json on boto import failure.

This commit is contained in:
Robert Estelle 2014-12-01 13:45:50 -05:00 committed by whiter
parent 60efbe8bec
commit 95006afe8c

View file

@ -145,15 +145,17 @@ EXAMPLES = '''
''' '''
import sys import sys # noqa
try: try:
import boto.ec2 import boto.ec2
import boto.vpc import boto.vpc
from boto.exception import EC2ResponseError from boto.exception import EC2ResponseError
HAS_BOTO = True
except ImportError: except ImportError:
print "failed=True msg='boto required for this module'" HAS_BOTO = False
sys.exit(1) if __name__ != '__main__':
raise
class AnsibleRouteTableException(Exception): class AnsibleRouteTableException(Exception):
@ -432,6 +434,8 @@ def main():
argument_spec=argument_spec, argument_spec=argument_spec,
supports_check_mode=True, supports_check_mode=True,
) )
if not HAS_BOTO:
module.fail_json(msg='boto is required for this module')
ec2_url, aws_access_key, aws_secret_key, region = get_ec2_creds(module) ec2_url, aws_access_key, aws_secret_key, region = get_ec2_creds(module)
if not region: if not region: