From 3ff782f871f4e789ce0e1a560ab6eef1ec7b4812 Mon Sep 17 00:00:00 2001
From: Thomas Woerner <twoerner@redhat.com>
Date: Thu, 3 Sep 2020 15:24:39 +0200
Subject: [PATCH] ipaserver/module_utils/ansible_ipa_server: IPA_MODULES moved
to ipalib.facts
IPA_MODULES has been moved from ipaserver.install.installutils to
ipalib.facts with https://pagure.io/freeipa/issue/8458
---
roles/ipaserver/module_utils/ansible_ipa_server.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/roles/ipaserver/module_utils/ansible_ipa_server.py b/roles/ipaserver/module_utils/ansible_ipa_server.py
index d9347513..0656d862 100644
--- a/roles/ipaserver/module_utils/ansible_ipa_server.py
+++ b/roles/ipaserver/module_utils/ansible_ipa_server.py
@@ -107,7 +107,7 @@ if NUM_VERSION >= 40500:
adtrust_imported = True
kra_imported = True
from ipaserver.install.installutils import (
- IPA_MODULES, BadHostError, get_fqdn, get_server_ip_address,
+ BadHostError, get_fqdn, get_server_ip_address,
is_ipa_configured, load_pkcs12, read_password, verify_fqdn,
update_hosts_file)
from ipaserver.install.server.install import (
@@ -122,6 +122,10 @@ if NUM_VERSION >= 40500:
except ImportError:
def default_subject_base(realm_name):
return DN(('O', realm_name))
+ try:
+ from ipalib.facts import IPA_MODULES
+ except ImportError:
+ from ipaserver.install.installutils import IPA_MODULES
try:
from ipaserver.install.installutils import default_ca_subject_dn
except ImportError:
--
GitLab