Merge pull request #256 from SDFE/route53_connect_params
Use aws connect calls that allow boto profile use
This commit is contained in:
commit
5d776936cc
1 changed files with 3 additions and 2 deletions
|
@ -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)
|
||||
|
||||
|
|
Loading…
Reference in a new issue