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

ovirt: Add env variables to dynamic inventory (#31821)

Browse source 
This patch add new environment variables to oVirt dynamic inventory
to be consistent with all other oVirt modules:

 OVIRT_URL
 OVIRT_USERNAME
 OVIRT_CAFILE
 OVIRT_PASSWORD

Those variables are used as fallback if user don't specify a ini file,
with appropriate variables there.
This commit is contained in:
Ondra Machacek 2017-10-18 12:26:03 +02:00 committed by John R Barker
parent 4602a4e117
commit a7df2322e4
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
contrib/inventory/ovirt4.py
View file

@ -124,10 +124,10 @@ def create_connection():
# Create parser and add ovirt section if it doesn't exist: # Create parser and add ovirt section if it doesn't exist:
config = configparser.SafeConfigParser( config = configparser.SafeConfigParser(
defaults={ defaults={
'ovirt_url': None, 'ovirt_url': os.environ.get('OVIRT_URL'),
'ovirt_username': None, 'ovirt_username': os.environ.get('OVIRT_USERNAME'),
'ovirt_password': None, 'ovirt_password': os.environ.get('OVIRT_PASSWORD'),
'ovirt_ca_file': None, 'ovirt_ca_file': os.environ.get('OVIRT_CAFILE'),
} }
) )
if not config.has_section('ovirt'): if not config.has_section('ovirt'):