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

ovirt: dyn_inventory fix Python2 and Python3 compat (#22453)

Browse source
This commit is contained in:
Ondra Machacek 2017-03-10 14:48:29 +01:00 committed by jctanner
parent 990aa73ed8
commit 0433be33bd
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
contrib/inventory/ovirt4.py
View file

@ -60,12 +60,16 @@ Author: Ondra Machacek (@machacekondra)
"""
import argparse
import ConfigParser
import os
import sys
from collections import defaultdict
try:
import ConfigParser as configparser
except ImportError:
import configparser
try:
import json
except ImportError:
@ -118,7 +122,7 @@ def create_connection():
config_path = os.environ.get('OVIRT_INI_PATH', default_path)
# Create parser and add ovirt section if it doesn't exist:
config = ConfigParser.SafeConfigParser(
config = configparser.SafeConfigParser(
defaults={
'ovirt_url': None,
'ovirt_username': None,
@ -135,8 +139,8 @@ def create_connection():
url=config.get('ovirt', 'ovirt_url'),
username=config.get('ovirt', 'ovirt_username'),
password=config.get('ovirt', 'ovirt_password'),
ca_file=config.get('ovirt', 'ovirt_ca_file', None),
insecure=config.get('ovirt', 'ovirt_ca_file', None) is None,
ca_file=config.get('ovirt', 'ovirt_ca_file'),
insecure=config.get('ovirt', 'ovirt_ca_file') is None,
)