From 06eb7357fd4459d8cf2f39ee5a6ba608bfcdbbfa Mon Sep 17 00:00:00 2001 From: James Tanner Date: Tue, 12 Nov 2013 14:10:38 -0500 Subject: [PATCH] Remove redundant credential code in vpc module --- library/cloud/vpc | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/library/cloud/vpc b/library/cloud/vpc index 4d218136a0c..c7d708f92ae 100644 --- a/library/cloud/vpc +++ b/library/cloud/vpc @@ -497,25 +497,7 @@ def main(): state = module.params.get('state') ec2_url, aws_access_key, aws_secret_key, region = get_ec2_creds(module) - - if not aws_secret_key: - if 'AWS_SECRET_KEY' in os.environ: - aws_secret_key = os.environ['AWS_SECRET_KEY'] - elif 'EC2_SECRET_KEY' in os.environ: - aws_secret_key = os.environ['EC2_SECRET_KEY'] - - if not aws_access_key: - if 'AWS_ACCESS_KEY' in os.environ: - aws_access_key = os.environ['AWS_ACCESS_KEY'] - elif 'EC2_ACCESS_KEY' in os.environ: - aws_access_key = os.environ['EC2_ACCESS_KEY'] - - if not region: - if 'AWS_REGION' in os.environ: - region = os.environ['AWS_REGION'] - elif 'EC2_REGION' in os.environ: - region = os.environ['EC2_REGION'] - + # If we have a region specified, connect to its endpoint. if region: try: