summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Coca <bcoca@ansible.com>2015-03-26 14:34:24 -0400
committerBrian Coca <bcoca@ansible.com>2015-03-26 14:34:24 -0400
commit5d776936cc67b2f43d6be9630872595243213fb0 (patch)
treedc58979f1554d18d1038ed816a56c137d6f75092
parent68daec05f2a1f3148d86a7bedd790400eaced0ff (diff)
parent4c0436688291687c1b6f9b167381833412ede6bf (diff)
downloadansible-modules-core-5d776936cc67b2f43d6be9630872595243213fb0.tar.gz
Merge pull request #256 from SDFE/route53_connect_params
Use aws connect calls that allow boto profile use
-rw-r--r--cloud/amazon/route53.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/cloud/amazon/route53.py b/cloud/amazon/route53.py
index 50de5cc3..6778870a 100644
--- a/cloud/amazon/route53.py
+++ b/cloud/amazon/route53.py
@@ -175,6 +175,7 @@ import time
try:
import boto
+ import boto.ec2
from boto import route53
from boto.route53.record import ResourceRecordSets
except ImportError:
@@ -224,7 +225,7 @@ def main():
retry_interval_in = module.params.get('retry_interval')
private_zone_in = module.params.get('private_zone')
- ec2_url, aws_access_key, aws_secret_key, region = get_ec2_creds(module)
+ region, ec2_url, aws_connect_params = get_aws_connection_info(module)
value_list = ()
@@ -251,7 +252,7 @@ def main():
# connect to the route53 endpoint
try:
- conn = boto.route53.connection.Route53Connection(aws_access_key, aws_secret_key)
+ conn = boto.route53.Route53Connection(**aws_connect_params)
except boto.exception.BotoServerError, e:
module.fail_json(msg = e.error_message)