diff --git a/roles/ipaclient/module_utils/ansible_ipa_client.py b/roles/ipaclient/module_utils/ansible_ipa_client.py index 48ef132528bb2323453e709431b289322b88d22c..fac8123481e33b24e8bff97d64170e26dd85c4bd 100644 --- a/roles/ipaclient/module_utils/ansible_ipa_client.py +++ b/roles/ipaclient/module_utils/ansible_ipa_client.py @@ -107,9 +107,12 @@ if NUM_VERSION >= 40400: from ipalib import api, errors, x509 from ipalib import constants try: - from ipalib.install import sysrestore + from ipalib import sysrestore except ImportError: - from ipapython import sysrestore + try: + from ipalib.install import sysrestore + except ImportError: + from ipapython import sysrestore try: from ipalib.install import certmonger except ImportError: diff --git a/roles/ipareplica/module_utils/ansible_ipa_replica.py b/roles/ipareplica/module_utils/ansible_ipa_replica.py index 368ec6b6dbab2d56a9e4ad5a6a37326322d3c7ae..b0f0d03456a66afaf11b3ba87da2ec6c686df391 100644 --- a/roles/ipareplica/module_utils/ansible_ipa_replica.py +++ b/roles/ipareplica/module_utils/ansible_ipa_replica.py @@ -101,7 +101,11 @@ if NUM_VERSION >= 40600: from ipaserver.install.service import ( find_providing_servers, find_providing_server) from ipaserver.install.installutils import ( - ReplicaConfig, load_pkcs12, is_ipa_configured) + ReplicaConfig, load_pkcs12) + try: + from ipalib.facts import is_ipa_configured + except ImportError: + from ipaserver.install.installutils import is_ipa_configured from ipaserver.install.replication import ( ReplicationManager, replica_conn_check) from ipaserver.install.server.replicainstall import ( diff --git a/roles/ipaserver/module_utils/ansible_ipa_server.py b/roles/ipaserver/module_utils/ansible_ipa_server.py index 0656d862247ad72ec17560426a3f9184c664033f..8447c048f6d09765edda3ad3f3c43e95159d6ff5 100644 --- a/roles/ipaserver/module_utils/ansible_ipa_server.py +++ b/roles/ipaserver/module_utils/ansible_ipa_server.py @@ -60,7 +60,11 @@ if NUM_VERSION >= 40500: # IPA version >= 4.5 from ipaclient.install.ipachangeconf import IPAChangeConf - from ipalib.install import certmonger, sysrestore + from ipalib.install import certmonger + try: + from ipalib import sysrestore + except ImportError: + from ipalib.install import sysrestore from ipapython import ipautil from ipapython.ipa_log_manager import standard_logging_setup try: @@ -108,8 +112,12 @@ if NUM_VERSION >= 40500: kra_imported = True from ipaserver.install.installutils import ( BadHostError, get_fqdn, get_server_ip_address, - is_ipa_configured, load_pkcs12, read_password, verify_fqdn, + load_pkcs12, read_password, verify_fqdn, update_hosts_file) + try: + from ipalib.facts import is_ipa_configured + except ImportError: + from ipaserver.install.installutils import is_ipa_configured from ipaserver.install.server.install import ( check_dirsrv, validate_admin_password, validate_dm_password, read_cache, write_cache)