Skip to content
Snippets Groups Projects
Unverified Commit e44de3c5 authored by Rafael Guterres Jeffman's avatar Rafael Guterres Jeffman Committed by GitHub
Browse files

Merge pull request #384 from t-woerner/ipalib_facts_IPA_MODULES

ipaserver/module_utils/ansible_ipa_server: IPA_MODULES moved to ipalib.facts
parents 97a03ee4 3ff782f8
No related branches found
No related tags found
No related merge requests found
......@@ -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:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment