wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix sqs_queue module to check that boto library is installed and AWS region & credentials are provided.

Browse source
This commit is contained in:
Alan Loi 2015-06-24 07:45:23 +10:00 committed by Matt Clay
parent e8e1e41e08
commit a14420dcf0
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/ansible/modules/extras/cloud/amazon/sqs_queue.py
View file

@ -84,7 +84,7 @@ EXAMPLES = '''
try:
import boto.sqs
from boto.exception import BotoServerError
from boto.exception import BotoServerError, NoAuthHandlerFound
HAS_BOTO = True
except ImportError:
@ -204,8 +204,18 @@ def main():
argument_spec=argument_spec,
supports_check_mode=True)
if not HAS_BOTO:
module.fail_json(msg='boto required for this module')
region, ec2_url, aws_connect_params = get_aws_connection_info(module)
connection = boto.sqs.connect_to_region(region)
if not region:
module.fail_json(msg='region must be specified')
try:
connection = connect_to_aws(boto.sqs, region, **aws_connect_params)
except (NoAuthHandlerFound, StandardError), e:
module.fail_json(msg=str(e))
state = module.params.get('state')
if state == 'present':