internet/ansible-freeipa
4
0
Fork 0
mirror of https://github.com/freeipa/ansible-freeipa.git synced 2026-07-30 11:24:50 +00:00
Code Issues Projects Releases Wiki Activity

ipaserver/module_utils/ansible_ipa_server: IPA_MODULES moved to ipalib.facts

Browse Source 
IPA_MODULES has been moved from ipaserver.install.installutils to
ipalib.facts with https://pagure.io/freeipa/issue/8458
This commit is contained in:
Thomas Woerner
2020-09-03 15:24:39 +02:00
parent 75d815e745
commit 3ff782f871
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
roles/ipaserver/module_utils/ansible_ipa_server.py
View File

@@ -107,7 +107,7 @@ if NUM_VERSION >= 40500:
adtrust_imported = True adtrust_imported = True
kra_imported = True kra_imported = True
from ipaserver.install.installutils import ( 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, is_ipa_configured, load_pkcs12, read_password, verify_fqdn,
update_hosts_file) update_hosts_file)
from ipaserver.install.server.install import ( from ipaserver.install.server.install import (
@@ -122,6 +122,10 @@ if NUM_VERSION >= 40500:
except ImportError: except ImportError:
def default_subject_base(realm_name): def default_subject_base(realm_name):
return DN(('O', realm_name)) return DN(('O', realm_name))
try:
from ipalib.facts import IPA_MODULES
except ImportError:
from ipaserver.install.installutils import IPA_MODULES
try: try:
from ipaserver.install.installutils import default_ca_subject_dn from ipaserver.install.installutils import default_ca_subject_dn
except ImportError: except ImportError: