From 4da3a724f1d57f5e1fe7f29804d82d835cceb3a5 Mon Sep 17 00:00:00 2001
From: Michael Weinrich <michael.weinrich@picturemaxx.com>
Date: Sun, 21 Jun 2015 23:51:14 +0200
Subject: [PATCH] Fix connection creation to allow usage of profiles with boto
---
cloud/amazon/iam_policy.py | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/cloud/amazon/iam_policy.py b/cloud/amazon/iam_policy.py
index 26d65450ec9..72e70221d29 100644
--- a/cloud/amazon/iam_policy.py
+++ b/cloud/amazon/iam_policy.py
@@ -115,6 +115,7 @@ import urllib
try:
import boto
import boto.iam
+ import boto.ec2
HAS_BOTO = True
except ImportError:
HAS_BOTO = False
@@ -293,13 +294,10 @@ def main():
else:
pdoc=None
- ec2_url, aws_access_key, aws_secret_key, region = get_ec2_creds(module)
+ region, ec2_url, aws_connect_kwargs = get_aws_connection_info(module)
try:
- iam = boto.iam.connection.IAMConnection(
- aws_access_key_id=aws_access_key,
- aws_secret_access_key=aws_secret_key,
- )
+ iam = boto.iam.connection.IAMConnection(**aws_connect_kwargs)
except boto.exception.NoAuthHandlerFound, e:
module.fail_json(msg=str(e))