[cloud] Don't remove profile, security_token by default in `aws_s3` (#30902) (#30930)

Comment above suggests only removing it for non-S3 services,
so let's actually enforce that.
pull/30949/head
Sloane Hertel 8 years ago committed by Ryan Brown
parent ed2a152b5e
commit 0195d3640b

@ -605,8 +605,9 @@ def main():
# Look at s3_url and tweak connection settings # Look at s3_url and tweak connection settings
# if connecting to RGW, Walrus or fakes3 # if connecting to RGW, Walrus or fakes3
for key in ['validate_certs', 'security_token', 'profile_name']: if s3_url:
aws_connect_kwargs.pop(key, None) for key in ['validate_certs', 'security_token', 'profile_name']:
aws_connect_kwargs.pop(key, None)
try: try:
s3 = get_s3_connection(module, aws_connect_kwargs, location, rgw, s3_url) s3 = get_s3_connection(module, aws_connect_kwargs, location, rgw, s3_url)
except (botocore.exceptions.NoCredentialsError, botocore.exceptions.ProfileNotFound) as e: except (botocore.exceptions.NoCredentialsError, botocore.exceptions.ProfileNotFound) as e:

Loading…
Cancel
Save