summaryrefslogtreecommitdiff
path: root/cloud/amazon/route53.py
diff options
context:
space:
mode:
authorDan Abel <dabel@thoughtworks.com>2014-10-31 14:29:59 +0000
committerTom Wadley <twadley@thoughtworks.com>2014-11-05 17:31:34 +0000
commit4c0436688291687c1b6f9b167381833412ede6bf (patch)
tree360288757d19301636d36755409b7e0a859cb970 /cloud/amazon/route53.py
parent488ac4cbdb769d5b9598e7d4c39582a6eda72bc1 (diff)
downloadansible-modules-core-4c0436688291687c1b6f9b167381833412ede6bf.tar.gz
use aws connect calls that allow boto profile use
Diffstat (limited to 'cloud/amazon/route53.py')
-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 b3878e05..bc6839b4 100644
--- a/cloud/amazon/route53.py
+++ b/cloud/amazon/route53.py
@@ -142,6 +142,7 @@ import time
try:
import boto
+ import boto.ec2
from boto import route53
from boto.route53.record import ResourceRecordSets
except ImportError:
@@ -185,7 +186,7 @@ def main():
value_in = module.params.get('value')
retry_interval_in = module.params.get('retry_interval')
- 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 = ()
@@ -207,7 +208,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)