From 40905510caf07464fdfdb46526e7c559dda94ace Mon Sep 17 00:00:00 2001
From: Thomas Woerner <twoerner@redhat.com>
Date: Fri, 5 Apr 2019 18:29:49 +0200
Subject: [PATCH] ansible_ipa_replica: Add import of ntpinstance again
This is needed in ipareplica_setup_ds and has been removed before as part
of commit f33d234d5af07e259bbd7b08dbdf684857f80f37.
---
.../ipareplica/module_utils/ansible_ipa_replica.py | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/roles/ipareplica/module_utils/ansible_ipa_replica.py b/roles/ipareplica/module_utils/ansible_ipa_replica.py
index daca9dc6..3b06da68 100644
--- a/roles/ipareplica/module_utils/ansible_ipa_replica.py
+++ b/roles/ipareplica/module_utils/ansible_ipa_replica.py
@@ -101,6 +101,19 @@ if NUM_VERSION >= 40600:
if six.PY3:
unicode = str
+ try:
+ from ipaclient.install import timeconf
+ time_service = "chronyd"
+ ntpinstance = None
+ except ImportError:
+ try:
+ from ipaclient.install import ntpconf as timeconf
+ except ImportError:
+ from ipaclient import ntpconf as timeconf
+ from ipaserver.install import ntpinstance
+ time_service = "ntpd"
+
+
else:
# IPA version < 4.6
--
GitLab