cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Check AWS region and credentials are provided.

Browse source
This commit is contained in:
Alan Loi 2015-06-29 20:55:33 +10:00 committed by Matt Clay
parent a7732e23dd
commit dbbeee34a0
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/ansible/modules/extras/cloud/amazon/dynamodb_table.py
View file

@ -120,7 +120,7 @@ try:
from boto.dynamodb2.table import Table from boto.dynamodb2.table import Table
from boto.dynamodb2.fields import HashKey, RangeKey from boto.dynamodb2.fields import HashKey, RangeKey
from boto.dynamodb2.types import STRING, NUMBER, BINARY from boto.dynamodb2.types import STRING, NUMBER, BINARY
from boto.exception import BotoServerError, JSONResponseError from boto.exception import BotoServerError, NoAuthHandlerFound, JSONResponseError
HAS_BOTO = True HAS_BOTO = True
except ImportError: except ImportError:
@ -262,8 +262,15 @@ def main():
module.fail_json(msg='boto required for this module') module.fail_json(msg='boto required for this module')
region, ec2_url, aws_connect_params = get_aws_connection_info(module) region, ec2_url, aws_connect_params = get_aws_connection_info(module)
if not region:
module.fail_json(msg='region must be specified')
try:
connection = connect_to_aws(boto.dynamodb2, region, **aws_connect_params) connection = connect_to_aws(boto.dynamodb2, region, **aws_connect_params)
except (NoAuthHandlerFound, StandardError), e:
module.fail_json(msg=str(e))
state = module.params.get('state') state = module.params.get('state')
if state == 'present': if state == 'present':
create_or_update_dynamo_table(connection, module) create_or_update_dynamo_table(connection, module)
@ -275,4 +282,5 @@ def main():
from ansible.module_utils.basic import * from ansible.module_utils.basic import *
from ansible.module_utils.ec2 import * from ansible.module_utils.ec2 import *
main() if __name__ == '__main__':
main()