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-14 12:06:49 -0500 |
| commit | d5bc2ead8c73943c0053198fb3ba9959a78b2b41 (patch) | |
| tree | d4a0a56d3e99e82b149ff1a3fa67fc736993b7ae /base/deploy/src/scriptlets/instance_layout.py | |
| parent | 7f046ceffe0d3a4f74f6202043790705133e59b6 (diff) | |
| download | pki-d5bc2ead8c73943c0053198fb3ba9959a78b2b41.tar.gz pki-d5bc2ead8c73943c0053198fb3ba9959a78b2b41.tar.xz pki-d5bc2ead8c73943c0053198fb3ba9959a78b2b41.zip | |
Refactored constants in pkiconfig.py.
The constants in pkiconfig.py have been moved into a new PKIConfig
class. All references have been modified accordingly.
Ticket #380
Diffstat (limited to 'base/deploy/src/scriptlets/instance_layout.py')
| -rw-r--r-- | base/deploy/src/scriptlets/instance_layout.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/base/deploy/src/scriptlets/instance_layout.py b/base/deploy/src/scriptlets/instance_layout.py index 67de6d01e..c320e421d 100644 --- a/base/deploy/src/scriptlets/instance_layout.py +++ b/base/deploy/src/scriptlets/instance_layout.py @@ -25,6 +25,7 @@ import os # 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 @@ -39,16 +40,16 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): def spawn(self): if config.str2bool(master['pki_skip_installation']): config.pki_log.info(log.SKIP_INSTANCE_SPAWN_1, __name__, - extra=config.PKI_INDENTATION_LEVEL_1) + extra=PKIConfig.PKI_INDENTATION_LEVEL_1) return self.rv config.pki_log.info(log.INSTANCE_SPAWN_1, __name__, - extra=config.PKI_INDENTATION_LEVEL_1) + extra=PKIConfig.PKI_INDENTATION_LEVEL_1) # establish instance logs util.directory.create(master['pki_instance_log_path']) # establish instance configuration util.directory.create(master['pki_instance_configuration_path']) # establish Apache/Tomcat specific instance - if master['pki_subsystem'] in config.PKI_TOMCAT_SUBSYSTEMS: + if master['pki_subsystem'] in PKIConfig.PKI_TOMCAT_SUBSYSTEMS: # establish Tomcat instance configuration util.directory.copy(master['pki_source_server_path'], master['pki_instance_configuration_path'], @@ -146,10 +147,10 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): def destroy(self): config.pki_log.info(log.INSTANCE_DESTROY_1, __name__, - extra=config.PKI_INDENTATION_LEVEL_1) + extra=PKIConfig.PKI_INDENTATION_LEVEL_1) if master['pki_subsystem'] == 'TKS': util.symlink.delete(master['pki_symkey_jar_link']) - if master['pki_subsystem'] in config.PKI_APACHE_SUBSYSTEMS and\ + if master['pki_subsystem'] in PKIConfig.PKI_APACHE_SUBSYSTEMS and\ util.instance.apache_instance_subsystems() == 0: # remove Apache instance base util.directory.delete(master['pki_instance_path']) @@ -164,7 +165,7 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): if util.instance.apache_instances() == 0: util.directory.delete( master['pki_instance_type_registry_path']) - elif master['pki_subsystem'] in config.PKI_TOMCAT_SUBSYSTEMS and\ + elif master['pki_subsystem'] in PKIConfig.PKI_TOMCAT_SUBSYSTEMS and\ util.instance.tomcat_instance_subsystems() == 0: # remove Tomcat instance base util.directory.delete(master['pki_instance_path']) |