diff options
| author | Endi Sukma Dewata <edewata@redhat.com> | 2012-11-13 22:31:37 -0500 |
|---|---|---|
| committer | Endi Sukma Dewata <edewata@redhat.com> | 2012-11-13 22:31:37 -0500 |
| commit | 126911eac9bc32f167b0f67e9801528b762af51e (patch) | |
| tree | 857586c0aed025cae864147678acd88b3d480866 /base/deploy/src/scriptlets/subsystem_layout.py | |
| parent | 74c6cb5810c7beb51611e4ce801103a340b15b21 (diff) | |
| download | pki-126911eac9bc32f167b0f67e9801528b762af51e.tar.gz pki-126911eac9bc32f167b0f67e9801528b762af51e.tar.xz pki-126911eac9bc32f167b0f67e9801528b762af51e.zip | |
Refactored constants in pkiconfig.py.
Diffstat (limited to 'base/deploy/src/scriptlets/subsystem_layout.py')
| -rw-r--r-- | base/deploy/src/scriptlets/subsystem_layout.py | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/base/deploy/src/scriptlets/subsystem_layout.py b/base/deploy/src/scriptlets/subsystem_layout.py index c4c4c2283..098f365d8 100644 --- a/base/deploy/src/scriptlets/subsystem_layout.py +++ b/base/deploy/src/scriptlets/subsystem_layout.py @@ -21,6 +21,7 @@ # PKI Deployment Imports import pkiconfig as config +from pkiconfig import PKIConfig from pkiconfig import pki_master_dict as master import pkihelper as util import pkimessages as log @@ -34,21 +35,21 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): def spawn(self): if config.str2bool(master['pki_skip_installation']): config.pki_log.info(log.SKIP_SUBSYSTEM_SPAWN_1, __name__, - extra=config.PKI_INDENTATION_LEVEL_1) + extra=PKIConfig.PKI_INDENTATION_LEVEL_1) return self.rv config.pki_log.info(log.SUBSYSTEM_SPAWN_1, __name__, - extra=config.PKI_INDENTATION_LEVEL_1) + extra=PKIConfig.PKI_INDENTATION_LEVEL_1) # establish instance-based subsystem logs util.directory.create(master['pki_subsystem_log_path']) util.directory.create(master['pki_subsystem_archive_log_path']) - if master['pki_subsystem'] in config.PKI_SIGNED_AUDIT_SUBSYSTEMS: + if master['pki_subsystem'] in PKIConfig.PKI_SIGNED_AUDIT_SUBSYSTEMS: util.directory.create(master['pki_subsystem_signed_audit_log_path']) # establish instance-based subsystem configuration util.directory.create(master['pki_subsystem_configuration_path']) # util.directory.copy(master['pki_source_conf_path'], # master['pki_subsystem_configuration_path']) # establish instance-based Apache/Tomcat specific subsystems - if master['pki_subsystem'] in config.PKI_TOMCAT_SUBSYSTEMS: + if master['pki_subsystem'] in PKIConfig.PKI_TOMCAT_SUBSYSTEMS: # establish instance-based Tomcat PKI subsystem base if master['pki_subsystem'] == "CA": util.directory.copy(master['pki_source_emails'], @@ -103,19 +104,19 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): def respawn(self): config.pki_log.info(log.SUBSYSTEM_RESPAWN_1, __name__, - extra=config.PKI_INDENTATION_LEVEL_1) + extra=PKIConfig.PKI_INDENTATION_LEVEL_1) return self.rv def destroy(self): config.pki_log.info(log.SUBSYSTEM_DESTROY_1, __name__, - extra=config.PKI_INDENTATION_LEVEL_1) + extra=PKIConfig.PKI_INDENTATION_LEVEL_1) # remove instance-based subsystem base if master['pki_subsystem'] == "CA": util.directory.delete(master['pki_subsystem_emails_path']) util.directory.delete(master['pki_subsystem_profiles_path']) util.directory.delete(master['pki_subsystem_path']) # remove instance-based subsystem logs - if master['pki_subsystem'] in config.PKI_SIGNED_AUDIT_SUBSYSTEMS: + if master['pki_subsystem'] in PKIConfig.PKI_SIGNED_AUDIT_SUBSYSTEMS: util.directory.delete(master['pki_subsystem_signed_audit_log_path']) util.directory.delete(master['pki_subsystem_archive_log_path']) util.directory.delete(master['pki_subsystem_log_path']) |