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

Add Python 3 support to ovirt4 inventory script. (#57824)

Browse source 
Python 3 only allows strings through the config parser. This is fine for 
the URL, Username, and Password since these values are required. The CA 
File is optional so an empty string is used in leiu of None in the 
config dictionary.
This commit is contained in:
Ryan Kraus 2019-06-21 12:05:45 -04:00 committed by Sam Doran
parent b86c7759c5
commit 7d4e3af11e
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/57824-python-3-support-ovirt-dynamic-inv.yml Normal file
View file

@ -0,0 +1,2 @@
minor_changes:
- ovirt4 inventory - Updated the dynamic inventory script for Python 3 support

6
contrib/inventory/ovirt4.py
View file

@ -121,7 +121,7 @@ def create_connection():
'ovirt_url': os.environ.get('OVIRT_URL'), 'ovirt_url': os.environ.get('OVIRT_URL'),
'ovirt_username': os.environ.get('OVIRT_USERNAME'), 'ovirt_username': os.environ.get('OVIRT_USERNAME'),
'ovirt_password': os.environ.get('OVIRT_PASSWORD'), 'ovirt_password': os.environ.get('OVIRT_PASSWORD'),
'ovirt_ca_file': os.environ.get('OVIRT_CAFILE'), 'ovirt_ca_file': os.environ.get('OVIRT_CAFILE', ''),
} }
) )
if not config.has_section('ovirt'): if not config.has_section('ovirt'):
@ -133,8 +133,8 @@ def create_connection():
url=config.get('ovirt', 'ovirt_url'), url=config.get('ovirt', 'ovirt_url'),
username=config.get('ovirt', 'ovirt_username'), username=config.get('ovirt', 'ovirt_username'),
password=config.get('ovirt', 'ovirt_password', raw=True), password=config.get('ovirt', 'ovirt_password', raw=True),
ca_file=config.get('ovirt', 'ovirt_ca_file'), ca_file=config.get('ovirt', 'ovirt_ca_file') or None,
insecure=config.get('ovirt', 'ovirt_ca_file') is None, insecure=not config.get('ovirt', 'ovirt_ca_file'),
) )