Skip to content
Snippets Groups Projects
Commit 3edc1bed authored by Thomas Woerner's avatar Thomas Woerner
Browse files

Make ipaserver role working with ipa 4.5(.4)

parent c5462d4a
No related branches found
No related tags found
No related merge requests found
...@@ -39,8 +39,8 @@ else: ...@@ -39,8 +39,8 @@ else:
IPA_PYTHON_VERSION = NUM_VERSION IPA_PYTHON_VERSION = NUM_VERSION
if NUM_VERSION >= 40600: if NUM_VERSION >= 40500:
# IPA version >= 4.6 # IPA version >= 4.5
import errno import errno
import pickle import pickle
...@@ -53,6 +53,8 @@ if NUM_VERSION >= 40600: ...@@ -53,6 +53,8 @@ if NUM_VERSION >= 40600:
from ipalib.install import certmonger, sysrestore from ipalib.install import certmonger, sysrestore
from ipapython import ipautil from ipapython import ipautil
if NUM_VERSION < 40600:
from ipapython.ipa_log_manager import root_logger
from ipapython.ipautil import ( from ipapython.ipautil import (
format_netloc, ipa_generate_password, run, user_input) format_netloc, ipa_generate_password, run, user_input)
from ipapython.admintool import ScriptError from ipapython.admintool import ScriptError
...@@ -61,6 +63,8 @@ if NUM_VERSION >= 40600: ...@@ -61,6 +63,8 @@ if NUM_VERSION >= 40600:
from ipaplatform.tasks import tasks from ipaplatform.tasks import tasks
from ipalib import api, errors, x509 from ipalib import api, errors, x509
from ipalib.constants import DOMAIN_LEVEL_0, MIN_DOMAIN_LEVEL, MAX_DOMAIN_LEVEL 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 ( from ipalib.util import (
validate_domain_name, validate_domain_name,
no_matching_interface_for_ip_address_warning, no_matching_interface_for_ip_address_warning,
...@@ -102,7 +106,7 @@ if NUM_VERSION >= 40600: ...@@ -102,7 +106,7 @@ if NUM_VERSION >= 40600:
_server_trust_ad_installed = False _server_trust_ad_installed = False
else: else:
# IPA version < 4.6 # IPA version < 4.5
raise Exception("freeipa version '%s' is too old" % VERSION) raise Exception("freeipa version '%s' is too old" % VERSION)
......
...@@ -87,6 +87,10 @@ def main(): ...@@ -87,6 +87,10 @@ def main():
fstore = sysrestore.FileStore(paths.SYSRESTORE) fstore = sysrestore.FileStore(paths.SYSRESTORE)
sstore = sysrestore.StateFile(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): with redirect_stdout(ansible_log):
services.knownservices.ipa.enable() services.knownservices.ipa.enable()
......
...@@ -124,6 +124,10 @@ def main(): ...@@ -124,6 +124,10 @@ def main():
# setup DS ############################################################## # 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 # Create a directory server instance
if not options.external_cert_files: if not options.external_cert_files:
ds = dsinstance.DsInstance(fstore=fstore, ds = dsinstance.DsInstance(fstore=fstore,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment