[Freeipa-devel] [PATCHES 0335-0336] adtrustinstance: Enable and start oddjobd

[Alexander Bokovoy]

On Wed, 08 Jul 2015, Tomas Babej wrote:
>From 66d39f12a77d23e8d8ac2c11650258ed9f3eb200 Mon Sep 17 00:00:00 2001
>From: Tomas Babej <tbabej at redhat.com>
>Date: Wed, 8 Jul 2015 15:44:13 +0200
>Subject: [PATCH] adtrustinstance: Enable and start oddjobd
>
>Enable and start the oddjobd service as part of the
>ipa-adtrust-install for the new IPA installations.
ACK

>---
> ipaserver/install/adtrustinstance.py | 19 +++++++++++++++++++
> ipaserver/install/installutils.py    | 11 +++++++++++
> 2 files changed, 30 insertions(+)
>
>diff --git a/ipaserver/install/adtrustinstance.py b/ipaserver/install/adtrustinstance.py
>index 8343f81826b661e0ab5a34073b0df9b477589ffa..ff0e8cc3e6dd7a78bd5a6ab06918757ca343970c 100644
>--- a/ipaserver/install/adtrustinstance.py
>+++ b/ipaserver/install/adtrustinstance.py
>@@ -706,6 +706,9 @@ class ADTRUSTInstance(service.Service):
>         except Exception, e:
>             root_logger.critical("Enabling nsswitch support in slapi-nis failed with error '%s'" % e)
> 
>+    def  __enable_and_start_oddjobd(self):
>+        installutils.enable_and_start_oddjobd(self.sstore)
>+
>     def __start(self):
>         try:
>             self.start()
>@@ -852,6 +855,7 @@ class ADTRUSTInstance(service.Service):
>         self.step("adding Default Trust View", self.__add_default_trust_view)
>         self.step("setting SELinux booleans", \
>                   self.__configure_selinux_for_smbd)
>+        self.step("enabling oddjobd", self.__enable_and_start_oddjobd)
>         self.step("starting CIFS services", self.__start)
> 
>         if self.add_sids:
>@@ -880,6 +884,21 @@ class ADTRUSTInstance(service.Service):
>         except Exception:
>             pass
> 
>+        # Restore oddjobd to its original state
>+        oddjobd = services.service('oddjobd')
>+
>+        if not self.sstore.restore_state('oddjobd', 'running'):
>+            try:
>+                oddjobd.stop()
>+            except Exception:
>+                pass
>+
>+        if not self.sstore.restore_state('oddjobd', 'enabled'):
>+            try:
>+                oddjobd.disable()
>+            except Exception:
>+                pass
>+
>         # Since we do not guarantee restoring back to working samba state,
>         # we should not restore smb.conf
> 
>diff --git a/ipaserver/install/installutils.py b/ipaserver/install/installutils.py
>index 08620c472b9478511d7d08a0d174e7da3f732207..02e8526317dbab909ed48a1823000922ce6e6b7a 100644
>--- a/ipaserver/install/installutils.py
>+++ b/ipaserver/install/installutils.py
>@@ -1081,3 +1081,14 @@ def check_version():
> 
> def realm_to_serverid(realm_name):
>     return "-".join(realm_name.split("."))
>+
>+def enable_and_start_oddjobd(sstore):
>+    oddjobd = services.service('oddjobd')
>+    sstore.backup_state('oddjobd', 'running', oddjobd.is_running())
>+    sstore.backup_state('oddjobd', 'enabled', oddjobd.is_enabled())
>+
>+    try:
>+        oddjobd.enable()
>+        oddjobd.start()
>+    except Exception as e:
>+        root_logger.critical("Unable to start oddjobd: {0}".format(str(e)))
>-- 
>2.1.0
>


-- 
/ Alexander Bokovoy