diff --git a/module_utils/ansible_ipa_server.py b/module_utils/ansible_ipa_server.py index 0dafd7546b578789d48fe6db75f4f186e4ee9c7e..14e075ae1a1ba2c57932fde348f74b7317ceacb5 100644 --- a/module_utils/ansible_ipa_server.py +++ b/module_utils/ansible_ipa_server.py @@ -39,8 +39,8 @@ else: IPA_PYTHON_VERSION = NUM_VERSION -if NUM_VERSION >= 40600: - # IPA version >= 4.6 +if NUM_VERSION >= 40500: + # IPA version >= 4.5 import errno import pickle @@ -53,6 +53,8 @@ if NUM_VERSION >= 40600: from ipalib.install import certmonger, sysrestore from ipapython import ipautil + if NUM_VERSION < 40600: + from ipapython.ipa_log_manager import root_logger from ipapython.ipautil import ( format_netloc, ipa_generate_password, run, user_input) from ipapython.admintool import ScriptError @@ -61,6 +63,8 @@ if NUM_VERSION >= 40600: from ipaplatform.tasks import tasks from ipalib import api, errors, x509 from ipalib.constants import DOMAIN_LEVEL_0, MIN_DOMAIN_LEVEL, MAX_DOMAIN_LEVEL + if NUM_VERSION < 40600: + from ipalib.constants import IPAAPI_USER from ipalib.util import ( validate_domain_name, no_matching_interface_for_ip_address_warning, @@ -102,7 +106,7 @@ if NUM_VERSION >= 40600: _server_trust_ad_installed = False else: - # IPA version < 4.6 + # IPA version < 4.5 raise Exception("freeipa version '%s' is too old" % VERSION) diff --git a/roles/ipaserver/library/ipaserver_enable_ipa.py b/roles/ipaserver/library/ipaserver_enable_ipa.py index d964ce9cf9c6352ad1fb1caeb5211337526e5fa3..eea1b5772f0579893997e6575d25c60c62fc51cb 100644 --- a/roles/ipaserver/library/ipaserver_enable_ipa.py +++ b/roles/ipaserver/library/ipaserver_enable_ipa.py @@ -87,6 +87,10 @@ def main(): fstore = sysrestore.FileStore(paths.SYSRESTORE) sstore = sysrestore.StateFile(paths.SYSRESTORE) + if NUM_VERSION < 40600: + # Make sure the files we crated in /var/run are recreated at startup + tasks.configure_tmpfiles() + with redirect_stdout(ansible_log): services.knownservices.ipa.enable() diff --git a/roles/ipaserver/library/ipaserver_setup_ds.py b/roles/ipaserver/library/ipaserver_setup_ds.py index 60ec2c280893a270670f9af7ed6f1402bae70cf5..211ac360482cfe39519f1d5b53003637bf3e10d7 100644 --- a/roles/ipaserver/library/ipaserver_setup_ds.py +++ b/roles/ipaserver/library/ipaserver_setup_ds.py @@ -124,6 +124,10 @@ def main(): # setup DS ############################################################## + if NUM_VERSION < 40600: + # Make sure tmpfiles dir exist before installing components + tasks.create_tmpfiles_dirs(IPAAPI_USER) + # Create a directory server instance if not options.external_cert_files: ds = dsinstance.DsInstance(fstore=fstore,