internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-07 22:02:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

ovirt: Add support to pass hostname (#40610)

Browse Source 
Previously we supported only to pass API URL, now we support also
hostname.
This commit is contained in:
Ondra Machacek
2018-05-23 17:12:46 +02:00
committed by Ryan Brown
parent bc7ff83cd9
commit 46fbfd5d53
4 changed files with 39 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/ansible/module_utils/ovirt.py
View File

@@ -135,8 +135,12 @@ def create_connection(auth):
:return: Python SDK connection
"""
url = auth.get('url')
if url is None and auth.get('hostname') is not None:
url = 'https://{0}/ovirt-engine/api'.format(auth.get('hostname'))
return sdk.Connection(
url=auth.get('url'),
url=url,
username=auth.get('username'),
password=auth.get('password'),
ca_file=auth.get('ca_file', None),
@@ -338,6 +342,7 @@ def wait(
def __get_auth_dict():
OVIRT_URL = os.environ.get('OVIRT_URL')
OVIRT_HOSTNAME = os.environ.get('OVIRT_HOSTNAME')
OVIRT_USERNAME = os.environ.get('OVIRT_USERNAME')
OVIRT_PASSWORD = os.environ.get('OVIRT_PASSWORD')
OVIRT_TOKEN = os.environ.get('OVIRT_TOKEN')
@@ -345,6 +350,8 @@ def __get_auth_dict():
OVIRT_INSECURE = OVIRT_CAFILE is None
env_vars = None
if OVIRT_URL is None and OVIRT_HOSTNAME is not None:
OVIRT_URL = 'https://{0}/ovirt-engine/api'.format(OVIRT_HOSTNAME)
if OVIRT_URL and ((OVIRT_USERNAME and OVIRT_PASSWORD) or OVIRT_TOKEN):
env_vars = {
'url': OVIRT_URL,