Refactor pkidestroy

The code that stops the instance in initialization.py has been
moved into instance_layout.py. The subsystem_layout.py has been
modified to wait until the subsystem is fully disabled.

Author: edewata

base/server/python/pki/server/__init__.py

@@ -1252,6 +1252,10 @@ def undeploy_webapp(
             'localhost',
             webapp_id + '.xml')
 
+        if not os.path.exists(context_xml):
+            logger.info('%s web application is not deployed', webapp_id)
+            return
+
         logger.info('Removing %s', context_xml)
         pki.util.remove(context_xml, force=force)
 

base/server/python/pki/server/deployment/__init__.py

@@ -5839,11 +5839,6 @@ def destroy(self):
         scriptlet.instance = self.instance
         scriptlet.destroy(self)
 
-        scriptlet = pki.server.deployment.scriptlets.finalization.PkiScriptlet()
-        scriptlet.deployer = self
-        scriptlet.instance = self.instance
-        scriptlet.destroy(self)
-
         scriptlet = pki.server.deployment.scriptlets.fapolicy_setup.PkiScriptlet()
         scriptlet.deployer = self
         scriptlet.instance = self.instance

base/server/python/pki/server/deployment/scriptlets/configuration.py

@@ -226,13 +226,6 @@ def spawn(self, deployer):
 
         if config.str2bool(deployer.mdict['pki_systemd_service_create']):
 
-            # Optionally, programmatically 'enable' the configured PKI instance
-            # to be started upon system boot (default is True)
-            if not config.str2bool(deployer.mdict['pki_enable_on_system_boot']):
-                instance.disable()
-            else:
-                instance.enable()
-
             if (len(instance.get_subsystems()) == 1 or
                     config.str2bool(deployer.mdict['pki_hsm_enable'])):
                 logger.info('Starting PKI server')

base/server/python/pki/server/deployment/scriptlets/finalization.py

@@ -79,11 +79,3 @@ def spawn(self, deployer):
         logger.info(log.PKISPAWN_END_MESSAGE_2,
                     deployer.subsystem_type,
                     instance.name)
-
-    def destroy(self, deployer):
-
-        instance = self.instance
-
-        logger.info(log.PKIDESTROY_END_MESSAGE_2,
-                    deployer.subsystem_type,
-                    instance.name)

base/server/python/pki/server/deployment/scriptlets/instance_layout.py

@@ -224,6 +224,14 @@ def spawn(self, deployer):
             deployer.write_systemd_overrides()
             deployer.systemd.daemon_reload()
 
+            # Optionally, programmatically 'enable' the configured PKI instance
+            # to be started upon system boot (default is True)
+
+            if not config.str2bool(deployer.mdict['pki_enable_on_system_boot']):
+                instance.disable()
+            else:
+                instance.enable()
+
             # Link /etc/systemd/system/pki-tomcatd.target.wants/pki-tomcatd@<instance>.service
             # to /lib/systemd/system/pki-tomcatd@.service
 
@@ -255,11 +263,14 @@ def destroy(self, deployer):
                 timeout=deployer.request_timeout)
             return
 
+        logger.info('Disabling PKI server')
+        instance.disable()
+
         logger.info('Removing %s instance', instance.name)
 
-        logger.info('Removing %s', deployer.systemd.systemd_link)
-        pki.util.unlink(link=deployer.systemd.systemd_link,
-                        force=deployer.force)
+        # logger.info('Removing %s', deployer.systemd.systemd_link)
+        # pki.util.unlink(link=deployer.systemd.systemd_link,
+        #                 force=deployer.force)
 
         if os.path.exists(deployer.systemd.base_override_dir):
             logger.info('Removing %s', deployer.systemd.base_override_dir)
@@ -309,6 +320,3 @@ def destroy(self, deployer):
             # Remove /var/lib/pki/<instance> if empty
             logger.info('Removing %s', instance.base_dir)
             pki.util.rmtree(path=instance.base_dir, force=deployer.force)
-
-        logger.info('Disabling PKI server')
-        instance.disable()