From 161c5b2f048b577404b8a28f662fda6f72ba5c12 Mon Sep 17 00:00:00 2001 From: Ade Lee Date: Wed, 29 Apr 2015 10:57:09 -0400 Subject: Code cleanup - simplify pkispawn code All subsystems are now tomcat instances. Conditionals based on whether the subsystem is a tomcat instance or not are no longer required. --- .../python/pki/server/deployment/scriptlets/security_databases.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'base/server/python/pki/server/deployment/scriptlets/security_databases.py') diff --git a/base/server/python/pki/server/deployment/scriptlets/security_databases.py b/base/server/python/pki/server/deployment/scriptlets/security_databases.py index 83ecdf130..3f8623af1 100644 --- a/base/server/python/pki/server/deployment/scriptlets/security_databases.py +++ b/base/server/python/pki/server/deployment/scriptlets/security_databases.py @@ -146,8 +146,7 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): config.pki_log.info(log.SECURITY_DATABASES_DESTROY_1, __name__, extra=config.PKI_INDENTATION_LEVEL_1) - if deployer.mdict['pki_subsystem'] in config.PKI_TOMCAT_SUBSYSTEMS \ - and len(deployer.instance.tomcat_instance_subsystems()) == 0: + if len(deployer.instance.tomcat_instance_subsystems()) == 0: deployer.file.delete(deployer.mdict['pki_cert_database']) deployer.file.delete(deployer.mdict['pki_key_database']) deployer.file.delete(deployer.mdict['pki_secmod_database']) -- cgit