From df7087813ee2bd14c2c78928b8766c37c579e9c2 Mon Sep 17 00:00:00 2001 From: Endi Sukma Dewata Date: Wed, 14 Nov 2012 00:53:04 -0500 Subject: Refactored config. --- base/deploy/src/scriptlets/security_databases.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'base/deploy/src/scriptlets/security_databases.py') diff --git a/base/deploy/src/scriptlets/security_databases.py b/base/deploy/src/scriptlets/security_databases.py index 10ba9a9f7..c5fb42312 100644 --- a/base/deploy/src/scriptlets/security_databases.py +++ b/base/deploy/src/scriptlets/security_databases.py @@ -20,7 +20,6 @@ # # PKI Deployment Imports -import pkiconfig as config from pkiconfig import PKIConfig from pkiconfig import pki_master_dict as master from pkiconfig import pki_sensitive_dict as sensitive @@ -34,7 +33,8 @@ import pkiscriptlet class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): rv = 0 - def spawn(self): + def spawn(self, config): + master = config.pki_master_dict if util.str2bool(master['pki_skip_installation']): pkilogging.pki_log.info(log.SKIP_SECURITY_DATABASES_SPAWN_1, __name__, extra=PKIConfig.PKI_INDENTATION_LEVEL_1) @@ -104,7 +104,8 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): extra=PKIConfig.PKI_INDENTATION_LEVEL_1) return self.rv - def destroy(self): + def destroy(self, config): + master = config.pki_master_dict pkilogging.pki_log.info(log.SECURITY_DATABASES_DESTROY_1, __name__, extra=PKIConfig.PKI_INDENTATION_LEVEL_1) if master['pki_subsystem'] in PKIConfig.PKI_APACHE_SUBSYSTEMS and\ -- cgit