From 0ecc83fe9808fa292a65cbac1aeb035f4a1fbed2 Mon Sep 17 00:00:00 2001 From: James Tanner Date: Tue, 12 Nov 2013 14:16:23 -0500 Subject: [PATCH] Change route53 module to use shared ec2 authorization module snippet --- library/cloud/route53 | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/library/cloud/route53 b/library/cloud/route53 index f279a1390be..4e3051feea2 100644 --- a/library/cloud/route53 +++ b/library/cloud/route53 @@ -165,8 +165,8 @@ def main(): record_in = module.params.get('record') type_in = module.params.get('type') value_in = module.params.get('value') - aws_secret_key = module.params.get('aws_secret_key') - aws_access_key = module.params.get('aws_access_key') + + ec2_url, aws_access_key, aws_secret_key, region = get_ec2_creds(module) value_list = () @@ -186,19 +186,6 @@ def main(): if not value_in: module.fail_json(msg = "parameter 'value' required for create/delete") - # allow environment variables to be used if ansible vars aren't set - if not aws_secret_key: - if 'AWS_SECRET_KEY' in os.environ: - aws_secret_key = os.environ['AWS_SECRET_KEY'] - elif 'EC2_SECRET_KEY' in os.environ: - aws_secret_key = os.environ['EC2_SECRET_KEY'] - - if not aws_access_key: - if 'AWS_ACCESS_KEY' in os.environ: - aws_access_key = os.environ['AWS_ACCESS_KEY'] - elif 'EC2_ACCESS_KEY' in os.environ: - aws_access_key = os.environ['EC2_ACCESS_KEY'] - # connect to the route53 endpoint try: conn = boto.route53.connection.Route53Connection(aws_access_key, aws_secret_key) @@ -263,7 +250,8 @@ def main(): module.exit_json(changed=True) -# this is magic, see lib/ansible/module_common.py -#<> +# import module snippets +from ansible.module_utils.basic import * +from ansible.module_utils.ec2 import * main()