From f33d234d5af07e259bbd7b08dbdf684857f80f37 Mon Sep 17 00:00:00 2001
From: Thomas Woerner <twoerner@redhat.com>
Date: Wed, 3 Apr 2019 17:58:40 +0200
Subject: [PATCH] ansible_ipa_server: Remove user_input, add missing DN and
ntpinstance
Removed unused user_input import from ipapython.ipautil. Added import
of DN from ipapython.dn. Set ntpinstance to None if timeconf or
sync_time could not be imported on older FreeIPA releases.
---
roles/ipaserver/module_utils/ansible_ipa_server.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/roles/ipaserver/module_utils/ansible_ipa_server.py b/roles/ipaserver/module_utils/ansible_ipa_server.py
index 58a26435..1e49b42e 100644
--- a/roles/ipaserver/module_utils/ansible_ipa_server.py
+++ b/roles/ipaserver/module_utils/ansible_ipa_server.py
@@ -59,7 +59,7 @@ if NUM_VERSION >= 40500:
if NUM_VERSION < 40600:
from ipapython.ipa_log_manager import root_logger
from ipapython.ipautil import (
- ipa_generate_password, run, user_input)
+ ipa_generate_password, run)
from ipapython.admintool import ScriptError
from ipaplatform import services
from ipaplatform.paths import paths
@@ -73,10 +73,12 @@ if NUM_VERSION >= 40500:
no_matching_interface_for_ip_address_warning,
)
from ipapython.dnsutil import check_zone_overlap
+ from ipapython.dn import DN
try:
from ipaclient.install import timeconf
from ipaclient.install.client import sync_time
time_service = "chronyd"
+ ntpinstance = None
except ImportError:
try:
from ipaclient.install import ntpconf as timeconf
@@ -196,7 +198,6 @@ class options_obj(object):
options = options_obj()
installer = options
-
def api_Backend_ldap2(host_name, setup_ca, connect=False):
# we are sure we have the configuration file ready.
cfg = dict(context='installer', confdir=paths.ETC_IPA, in_server=True,
--
GitLab