From 0172c1fbf0906fac91a294541bd499b2df069a63 Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" Date: Fri, 13 Sep 2024 18:20:57 -0500 Subject: [PATCH] Update PKIServer.remove_subsystem() to take subsystem name --- base/server/python/pki/server/__init__.py | 4 ++-- .../pki/server/deployment/scriptlets/subsystem_layout.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/base/server/python/pki/server/__init__.py b/base/server/python/pki/server/__init__.py index 6c0cc0edaea..fcbef1fe2a0 100644 --- a/base/server/python/pki/server/__init__.py +++ b/base/server/python/pki/server/__init__.py @@ -1460,8 +1460,8 @@ def get_subsystem(self, subsystem_name): def add_subsystem(self, subsystem): self.subsystems[subsystem.name] = subsystem - def remove_subsystem(self, subsystem): - return self.subsystems.pop(subsystem.name, None) + def remove_subsystem(self, subsystem_name): + return self.subsystems.pop(subsystem_name, None) def enable_subsystems(self): for subsystem in self.get_subsystems(): diff --git a/base/server/python/pki/server/deployment/scriptlets/subsystem_layout.py b/base/server/python/pki/server/deployment/scriptlets/subsystem_layout.py index c1b34a3e50d..c1369634005 100644 --- a/base/server/python/pki/server/deployment/scriptlets/subsystem_layout.py +++ b/base/server/python/pki/server/deployment/scriptlets/subsystem_layout.py @@ -313,7 +313,7 @@ def destroy(self, deployer): logger.info('Removing %s subsystem', deployer.subsystem_type) - instance.remove_subsystem(subsystem) + instance.remove_subsystem(subsystem_name) if config.str2bool(deployer.mdict['pki_registry_enable']): subsystem.remove_registry(force=deployer.force)