ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Fixes ovirt inventory to only override credentials from environment when keys exist

Browse source
This commit is contained in:
karimb 2016-03-16 13:58:08 +01:00
parent 9be6974d37
commit 421fb6df8b
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
contrib/inventory/ovirt.py
View file

@ -172,9 +172,9 @@ class OVirtInventory(object):
# If the appropriate environment variables are set, they override # If the appropriate environment variables are set, they override
# other configuration; process those into our args and kwargs. # other configuration; process those into our args and kwargs.
kwargs['url'] = os.environ.get('OVIRT_URL') kwargs['url'] = os.environ.get('OVIRT_URL', kwargs['url'])
kwargs['username'] = os.environ.get('OVIRT_EMAIL') kwargs['username'] = next(val for val in [os.environ.get('OVIRT_EMAIL'), os.environ.get('OVIRT_USERNAME'), kwargs['username']] if val is not None)
kwargs['password'] = os.environ.get('OVIRT_PASS') kwargs['password'] = next(val for val in [os.environ.get('OVIRT_PASS'), os.environ.get('OVIRT_PASSWORD'), kwargs['password']] if val is not None)
# Retrieve and return the ovirt driver. # Retrieve and return the ovirt driver.
return API(insecure=True, **kwargs) return API(insecure=True, **kwargs)