Add tasks.systemd_daemon_reload()

systemd daemon must be reloaded after a config file is added, changed,
or removed. Provide a common API endpoint in ipaplatform.tasks.

Related: https://pagure.io/freeipa/issue/7860
Signed-off-by: Christian Heimes <cheimes@redhat.com>
Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>

ipaplatform/base/services.py

@@ -35,6 +35,7 @@ import six
 
 from ipapython import ipautil
 from ipaplatform.paths import paths
+from ipaplatform.tasks import tasks
 
 # pylint: disable=no-name-in-module, import-error
 if six.PY3:
@@ -452,7 +453,7 @@ class SystemdService(PlatformService):
                         # Link exists and it is broken, make new one
                         os.unlink(srv_lnk)
                         os.symlink(self.lib_path, srv_lnk)
-                ipautil.run([paths.SYSTEMCTL, "--system", "daemon-reload"])
+                tasks.systemd_daemon_reload()
             except Exception:
                 pass
         else:
@@ -475,7 +476,7 @@ class SystemdService(PlatformService):
                 if os.path.isdir(srv_tgt):
                     if os.path.islink(srv_lnk):
                         os.unlink(srv_lnk)
-                ipautil.run([paths.SYSTEMCTL, "--system", "daemon-reload"])
+                tasks.systemd_daemon_reload()
             except Exception:
                 pass
         else:

ipaplatform/base/tasks.py

@@ -251,5 +251,9 @@ class BaseTaskNamespace:
     def setup_httpd_logging(self):
         raise NotImplementedError()
 
+    def systemd_daemon_reload(self):
+        """Tell systemd to reload config files"""
+        raise NotImplementedError
+
 
 tasks = BaseTaskNamespace()

ipaplatform/redhat/tasks.py

@@ -498,9 +498,11 @@ class RedHatTaskNamespace(BaseTaskNamespace):
 
         os.chmod(paths.SYSTEMD_SYSTEM_HTTPD_IPA_CONF, 0o644)
         self.restore_context(paths.SYSTEMD_SYSTEM_HTTPD_IPA_CONF)
+        self.systemd_daemon_reload()
 
-        ipautil.run([paths.SYSTEMCTL, "--system", "daemon-reload"],
-                    raiseonerr=False)
+    def systemd_daemon_reload(self):
+        """Tell systemd to reload config files"""
+        ipautil.run([paths.SYSTEMCTL, "--system", "daemon-reload"])
 
     def configure_http_gssproxy_conf(self, ipaapi_user):
         ipautil.copy_template_file(
@@ -564,8 +566,7 @@ class RedHatTaskNamespace(BaseTaskNamespace):
                 )
             return
 
-        ipautil.run([paths.SYSTEMCTL, "--system", "daemon-reload"],
-                    raiseonerr=False)
+        self.systemd_daemon_reload()
 
     def set_hostname(self, hostname):
         ipautil.run([paths.BIN_HOSTNAMECTL, 'set-hostname', hostname])

ipaserver/install/ipa_restore.py

@@ -451,7 +451,7 @@ class Restore(admintool.AdminTool):
                 oddjobd.start()
                 http.remove_httpd_ccaches()
                 # have the daemons pick up their restored configs
-                run([paths.SYSTEMCTL, "--system", "daemon-reload"])
+                tasks.systemd_daemon_reload()
         finally:
             try:
                 os.chdir(cwd)