On Wed, 08 Jul 2015, Tomas Babej wrote:
From c6135d634cbccbdbb30ab3906c32cd3720bca95e Mon Sep 17 00:00:00 2001
From: Tomas Babej <tba...@redhat.com>
Date: Wed, 8 Jul 2015 15:45:18 +0200
Subject: [PATCH] upgrade: Enable and start oddjobd if adtrust is available

If ipa-adtrust-install has already been run on the system,
enable and start the oddjobd service.
ACK as well.


---
install/updates/90-post_upgrade_plugins.update |  1 +
ipaserver/install/plugins/adtrust.py           | 24 ++++++++++++++++++++++++
2 files changed, 25 insertions(+)

diff --git a/install/updates/90-post_upgrade_plugins.update 
b/install/updates/90-post_upgrade_plugins.update
index 
8e8fe09414eac57d2e8c15dcfc4aed64b6e35cd5..3df3a4574705dbd8df8f25149c13877898afb66b
 100644
--- a/install/updates/90-post_upgrade_plugins.update
+++ b/install/updates/90-post_upgrade_plugins.update
@@ -18,3 +18,4 @@ plugin: update_managed_post
plugin: update_managed_permissions
plugin: update_idrange_baserid
plugin: update_passync_privilege_update
+plugin: update_oddjobd_for_adtrust
diff --git a/ipaserver/install/plugins/adtrust.py 
b/ipaserver/install/plugins/adtrust.py
index 
d96bfe83e3b9d1d3e64b9fde385fbf520ed20a3a..45bcc5f2fe532446342300ff0c5e1e7149cf023b
 100644
--- a/ipaserver/install/plugins/adtrust.py
+++ b/ipaserver/install/plugins/adtrust.py
@@ -19,8 +19,11 @@

from ipalib import api, errors
from ipalib import Updater
+from ipaplatform.paths import paths
from ipapython.dn import DN
from ipapython.ipa_log_manager import *
+from ipapython import sysrestore
+from ipaserver.install import installutils

DEFAULT_ID_RANGE_SIZE = 200000

@@ -161,5 +164,26 @@ class update_default_trust_view(Updater):

        return False, [update]

+
+class update_oddjobd_for_adtrust(Updater):
+    """
+    Enables and starts oddjobd daemon if ipa-adtrust-install has been run
+    on this system.
+    """
+
+    def execute(self, **options):
+        adtrust_is_enabled = self.api.Command['adtrust_is_enabled']()['result']
+
+        if adtrust_is_enabled:
+            self.log.debug('Try to enable and start oddjobd')
+            sstore = sysrestore.StateFile(paths.SYSRESTORE)
+            installutils.enable_and_start_oddjobd(sstore)
+        else:
+            self.log.debug('ADTrust not configured on this server, do not '
+                           'start and enable oddjobd')
+
+        return False, []
+
api.register(update_default_range)
api.register(update_default_trust_view)
+api.register(update_oddjobd_for_adtrust)
--
2.1.0



--
/ Alexander Bokovoy

--
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code

Reply via email to