issue #994: use HAS_BOTO to determine if import was successful: - removed import of sys module. - HAS_BOTO constant to check if import was successful. - trigger a failure when import fails. - removed unnecessary imports.

This commit is contained in:
steenzout 2015-04-01 17:16:54 -06:00 committed by Matt Clay
commit 67f769d9a6
21 changed files with 121 additions and 74 deletions

View file

@ -73,15 +73,13 @@ EXAMPLES = '''
name: norwegian-blue
'''
import sys
import time
try:
import boto.rds
from boto.exception import BotoServerError
HAS_BOTO = True
except ImportError:
print "failed=True msg='boto required for this module'"
sys.exit(1)
HAS_BOTO = False
def main():
argument_spec = ec2_argument_spec()
@ -94,6 +92,9 @@ def main():
)
module = AnsibleModule(argument_spec=argument_spec)
if not HAS_BOTO:
module.fail_json(msg='boto required for this module')
state = module.params.get('state')
group_name = module.params.get('name').lower()
group_description = module.params.get('description')