Merge pull request #1206 from mjfroehlich/ec2-support-mfa-auth

ec2: Use get_aws_connection_info to get AWS creds.
11 years ago · d8b9c1f440
parent 137b7e02e7 4bcbcc8869
commit d8b9c1f440
1 changed files with 2 additions and 6 deletions
--- a/cloud/amazon/ec2.py
+++ b/cloud/amazon/ec2.py
@ -1207,15 +1207,11 @@ def main():

    ec2 = ec2_connect(module)

-    ec2_url, aws_access_key, aws_secret_key, region = get_ec2_creds(module)
+    region, ec2_url, aws_connect_kwargs = get_aws_connection_info(module)

    if region:
        try:
-            vpc = boto.vpc.connect_to_region(
-                region,
-                aws_access_key_id=aws_access_key,
-                aws_secret_access_key=aws_secret_key
-            )
+            vpc = boto.vpc.connect_to_region(region, **aws_connect_kwargs)
        except boto.exception.NoAuthHandlerFound, e:
            module.fail_json(msg = str(e))
    else: