Merge pull request #14356 from mludvig/session_token

Add support for AWS_SESSION_TOKEN environment variable. (trivial patch)
This commit is contained in:
James Cammarata 2016-06-22 18:51:09 -05:00 committed by GitHub
commit 7c27f72515

View file

@ -156,6 +156,8 @@ def get_aws_connection_info(module, boto3=False):
if not security_token:
if 'AWS_SECURITY_TOKEN' in os.environ:
security_token = os.environ['AWS_SECURITY_TOKEN']
elif 'AWS_SESSION_TOKEN' in os.environ:
security_token = os.environ['AWS_SESSION_TOKEN']
elif 'EC2_SECURITY_TOKEN' in os.environ:
security_token = os.environ['EC2_SECURITY_TOKEN']
else: