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

Merge pull request #256 from SDFE/route53_connect_params

Browse source 
Use aws connect calls that allow boto profile use
This commit is contained in:
Brian Coca 2015-03-26 14:34:24 -04:00
commit 5d776936cc
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cloud/amazon/route53.py
View file

@ -175,6 +175,7 @@ import time
try: try:
import boto import boto
import boto.ec2
from boto import route53 from boto import route53
from boto.route53.record import ResourceRecordSets from boto.route53.record import ResourceRecordSets
except ImportError: except ImportError:
@ -224,7 +225,7 @@ def main():
retry_interval_in = module.params.get('retry_interval') retry_interval_in = module.params.get('retry_interval')
private_zone_in = module.params.get('private_zone') 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 = () value_list = ()
@ -251,7 +252,7 @@ def main():
# connect to the route53 endpoint # connect to the route53 endpoint
try: try:
conn = boto.route53.connection.Route53Connection(aws_access_key, aws_secret_key) conn = boto.route53.Route53Connection(**aws_connect_params)
except boto.exception.BotoServerError, e: except boto.exception.BotoServerError, e:
module.fail_json(msg = e.error_message) module.fail_json(msg = e.error_message)