cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixing race condition in ec2 inventory plugin (#59638)

Browse source 
* Fixing race condition in ec2 inventory plugin

Co-Authored-By: Sviatoslav Sydorenko <wk.cvs.github@sydorenko.org.ua>

* Fixing code block according to suggestion

* Adding changelog fragment
This commit is contained in:
Ihor Borodin 2019-07-26 20:27:49 +03:00 committed by Sloane Hertel
parent 007fe842b9
commit 3b5a96fcb7
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/59638-aws-ec2-plugin-fix-race.yaml Normal file
View file

@ -0,0 +1,2 @@
bugfixes:
- aws_ec2 inventory plugin - fixed race condition when trying to fetch IAM instance profile (role) credentials (https://github.com/ansible/ansible/pull/59638)

12
lib/ansible/plugins/inventory/aws_ec2.py
View file

@ -579,10 +579,14 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
if not self.boto_profile and not (self.aws_access_key_id and self.aws_secret_access_key):
session = botocore.session.get_session()
if session.get_credentials() is not None:
self.aws_access_key_id = session.get_credentials().access_key
self.aws_secret_access_key = session.get_credentials().secret_key
self.aws_security_token = session.get_credentials().token
try:
credentials = session.get_credentials().get_frozen_credentials()
except AttributeError:
pass
else:
self.aws_access_key_id = credentials.access_key
self.aws_secret_access_key = credentials.secret_key
self.aws_security_token = credentials.token
if not self.boto_profile and not (self.aws_access_key_id and self.aws_secret_access_key):
raise AnsibleError("Insufficient boto credentials found. Please provide them in your "