diff options
| author | Ade Lee <alee@redhat.com> | 2015-04-29 10:57:09 -0400 |
|---|---|---|
| committer | Ade Lee <alee@redhat.com> | 2015-04-29 17:28:19 -0400 |
| commit | 161c5b2f048b577404b8a28f662fda6f72ba5c12 (patch) | |
| tree | c80b6800154cd726004e7944ac8e501cb35c8041 /base/server/python/pki/server/deployment/scriptlets/security_databases.py | |
| parent | 267635f87c5ba9382f0931ad3e1b7cb9e42c6a6d (diff) | |
| download | pki-161c5b2f048b577404b8a28f662fda6f72ba5c12.tar.gz pki-161c5b2f048b577404b8a28f662fda6f72ba5c12.tar.xz pki-161c5b2f048b577404b8a28f662fda6f72ba5c12.zip | |
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.
Diffstat (limited to 'base/server/python/pki/server/deployment/scriptlets/security_databases.py')
| -rw-r--r-- | base/server/python/pki/server/deployment/scriptlets/security_databases.py | 3 |
1 files changed, 1 insertions, 2 deletions
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']) |