diff options
| author | Brian Coca <bcoca@ansible.com> | 2015-03-26 15:53:33 -0400 |
|---|---|---|
| committer | Brian Coca <bcoca@ansible.com> | 2015-03-26 15:53:33 -0400 |
| commit | eacf4e42395689893478c16fea66ed7129b82403 (patch) | |
| tree | ac00372ef018afd609d35c4287837d0c174781e2 | |
| parent | 7e7eafb3e31ad03b255c633460766e8c93616e65 (diff) | |
| parent | 1e08f508c60284faffd27c06d72308a48db16a23 (diff) | |
| download | ansible-modules-core-eacf4e42395689893478c16fea66ed7129b82403.tar.gz | |
Merge pull request #269 from SDFE/rds_subnet_group_params
use aws connect call in rds_subnet_group that allows boto profile use
| -rw-r--r-- | cloud/amazon/rds_subnet_group.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cloud/amazon/rds_subnet_group.py b/cloud/amazon/rds_subnet_group.py index 9731154f..40170ba5 100644 --- a/cloud/amazon/rds_subnet_group.py +++ b/cloud/amazon/rds_subnet_group.py @@ -121,13 +121,13 @@ def main(): module.fail_json(msg = str("Parameter %s not allowed for state='absent'" % not_allowed)) # Retrieve any AWS settings from the environment. - ec2_url, aws_access_key, aws_secret_key, region = get_ec2_creds(module) + region, ec2_url, aws_connect_params = get_aws_connection_info(module) if not region: module.fail_json(msg = str("region not specified and unable to determine region from EC2_REGION.")) try: - conn = boto.rds.connect_to_region(region, aws_access_key_id=aws_access_key, aws_secret_access_key=aws_secret_key) + conn = boto.rds.connect_to_region(region, **aws_connect_params) except boto.exception.BotoServerError, e: module.fail_json(msg = e.error_message) |