From a1a78a64b715f5b6faa0063372c1de43a9fe5fb5 Mon Sep 17 00:00:00 2001 From: Endi Sukma Dewata Date: Thu, 15 Nov 2012 03:29:35 -0500 Subject: Fixed str2bool() in scriptlets. --- base/deploy/src/scriptlets/configuration.py | 4 ++-- base/deploy/src/scriptlets/finalization.py | 10 +++++----- base/deploy/src/scriptlets/infrastructure_layout.py | 2 +- base/deploy/src/scriptlets/initialization.py | 2 +- base/deploy/src/scriptlets/instance_layout.py | 2 +- base/deploy/src/scriptlets/security_databases.py | 2 +- base/deploy/src/scriptlets/selinux_setup.py | 2 +- base/deploy/src/scriptlets/slot_substitution.py | 2 +- base/deploy/src/scriptlets/subsystem_layout.py | 2 +- base/deploy/src/scriptlets/webapp_deployment.py | 2 +- 10 files changed, 15 insertions(+), 15 deletions(-) diff --git a/base/deploy/src/scriptlets/configuration.py b/base/deploy/src/scriptlets/configuration.py index 07914b970..c9a68884a 100644 --- a/base/deploy/src/scriptlets/configuration.py +++ b/base/deploy/src/scriptlets/configuration.py @@ -35,7 +35,7 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): rv = 0 def spawn(self): - if config.str2bool(master['pki_skip_configuration']): + if util.str2bool(master['pki_skip_configuration']): pkilogging.pki_log.info(log.SKIP_CONFIGURATION_SPAWN_1, __name__, extra=PKIConfig.PKI_INDENTATION_LEVEL_1) return self.rv @@ -84,7 +84,7 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): elif master['pki_subsystem'] in PKIConfig.PKI_TOMCAT_SUBSYSTEMS: # Optionally prepare to enable a java debugger # (e. g. - 'eclipse'): - if config.str2bool(master['pki_enable_java_debugger']): + if util.str2bool(master['pki_enable_java_debugger']): config.prepare_for_an_external_java_debugger( master['pki_target_tomcat_conf_instance_id']) tomcat_instance_subsystems =\ diff --git a/base/deploy/src/scriptlets/finalization.py b/base/deploy/src/scriptlets/finalization.py index f11e2ed73..36068c153 100644 --- a/base/deploy/src/scriptlets/finalization.py +++ b/base/deploy/src/scriptlets/finalization.py @@ -35,7 +35,7 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): rv = 0 def spawn(self): - if config.str2bool(master['pki_skip_installation']): + if util.str2bool(master['pki_skip_installation']): pkilogging.pki_log.info(log.SKIP_FINALIZATION_SPAWN_1, __name__, extra=PKIConfig.PKI_INDENTATION_LEVEL_1) return self.rv @@ -59,7 +59,7 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): util.file.copy(master['pki_manifest'], master['pki_manifest_spawn_archive']) # Optionally, programmatically 'restart' the configured PKI instance - if config.str2bool(master['pki_restart_configured_instance']): + if util.str2bool(master['pki_restart_configured_instance']): util.systemd.restart() # Optionally, 'purge' the entire temporary client infrastructure # including the client NSS security databases and password files @@ -68,12 +68,12 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): # placed under this infrastructure, it may accidentally # be deleted! # - if config.str2bool(master['pki_client_database_purge']): + if util.str2bool(master['pki_client_database_purge']): if util.directory.exists(master['pki_client_dir']): util.directory.delete(master['pki_client_dir']) # If instance has not been configured, print the # configuration URL to the log - if config.str2bool(master['pki_skip_configuration']): + if util.str2bool(master['pki_skip_configuration']): util.configuration_file.log_configuration_url() # Log final process messages pkilogging.pki_log.info(log.PKISPAWN_END_MESSAGE_2, @@ -83,7 +83,7 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): util.file.modify(master['pki_spawn_log'], silent=True) # If instance has not been configured, print the # configuration URL to the screen - if config.str2bool(master['pki_skip_configuration']): + if util.str2bool(master['pki_skip_configuration']): util.configuration_file.display_configuration_url() return self.rv diff --git a/base/deploy/src/scriptlets/infrastructure_layout.py b/base/deploy/src/scriptlets/infrastructure_layout.py index 5e86710f2..7726133a0 100644 --- a/base/deploy/src/scriptlets/infrastructure_layout.py +++ b/base/deploy/src/scriptlets/infrastructure_layout.py @@ -34,7 +34,7 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): rv = 0 def spawn(self): - if config.str2bool(master['pki_skip_installation']): + if util.str2bool(master['pki_skip_installation']): pkilogging.pki_log.info(log.SKIP_ADMIN_DOMAIN_SPAWN_1, __name__, extra=PKIConfig.PKI_INDENTATION_LEVEL_1) return self.rv diff --git a/base/deploy/src/scriptlets/initialization.py b/base/deploy/src/scriptlets/initialization.py index b64f52f1d..abd192b63 100644 --- a/base/deploy/src/scriptlets/initialization.py +++ b/base/deploy/src/scriptlets/initialization.py @@ -39,7 +39,7 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): master['pki_subsystem'], master['pki_instance_id'], extra=PKIConfig.PKI_INDENTATION_LEVEL_0) - if config.str2bool(master['pki_skip_installation']): + if util.str2bool(master['pki_skip_installation']): pkilogging.pki_log.info(log.SKIP_INITIALIZATION_SPAWN_1, __name__, extra=PKIConfig.PKI_INDENTATION_LEVEL_1) return self.rv diff --git a/base/deploy/src/scriptlets/instance_layout.py b/base/deploy/src/scriptlets/instance_layout.py index aae9c0a0c..0caad1d40 100644 --- a/base/deploy/src/scriptlets/instance_layout.py +++ b/base/deploy/src/scriptlets/instance_layout.py @@ -39,7 +39,7 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): rv = 0 def spawn(self): - if config.str2bool(master['pki_skip_installation']): + if util.str2bool(master['pki_skip_installation']): pkilogging.pki_log.info(log.SKIP_INSTANCE_SPAWN_1, __name__, extra=PKIConfig.PKI_INDENTATION_LEVEL_1) return self.rv diff --git a/base/deploy/src/scriptlets/security_databases.py b/base/deploy/src/scriptlets/security_databases.py index 5e4cb718b..19da1d5df 100644 --- a/base/deploy/src/scriptlets/security_databases.py +++ b/base/deploy/src/scriptlets/security_databases.py @@ -35,7 +35,7 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): rv = 0 def spawn(self): - if config.str2bool(master['pki_skip_installation']): + if util.str2bool(master['pki_skip_installation']): pkilogging.pki_log.info(log.SKIP_SECURITY_DATABASES_SPAWN_1, __name__, extra=PKIConfig.PKI_INDENTATION_LEVEL_1) return self.rv diff --git a/base/deploy/src/scriptlets/selinux_setup.py b/base/deploy/src/scriptlets/selinux_setup.py index 130593953..57c335ee1 100644 --- a/base/deploy/src/scriptlets/selinux_setup.py +++ b/base/deploy/src/scriptlets/selinux_setup.py @@ -42,7 +42,7 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): selinux.restorecon(master['pki_instance_configuration_path'], True) def spawn(self): - if config.str2bool(master['pki_skip_installation']): + if util.str2bool(master['pki_skip_installation']): pkilogging.pki_log.info(log.SKIP_SELINUX_SPAWN_1, __name__, extra=PKIConfig.PKI_INDENTATION_LEVEL_1) return self.rv diff --git a/base/deploy/src/scriptlets/slot_substitution.py b/base/deploy/src/scriptlets/slot_substitution.py index 7e3971ab1..e0451f327 100644 --- a/base/deploy/src/scriptlets/slot_substitution.py +++ b/base/deploy/src/scriptlets/slot_substitution.py @@ -35,7 +35,7 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): rv = 0 def spawn(self): - if config.str2bool(master['pki_skip_installation']): + if util.str2bool(master['pki_skip_installation']): pkilogging.pki_log.info(log.SKIP_SLOT_ASSIGNMENT_SPAWN_1, __name__, extra=PKIConfig.PKI_INDENTATION_LEVEL_1) return self.rv diff --git a/base/deploy/src/scriptlets/subsystem_layout.py b/base/deploy/src/scriptlets/subsystem_layout.py index 65b760fc2..22d569906 100644 --- a/base/deploy/src/scriptlets/subsystem_layout.py +++ b/base/deploy/src/scriptlets/subsystem_layout.py @@ -34,7 +34,7 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): rv = 0 def spawn(self): - if config.str2bool(master['pki_skip_installation']): + if util.str2bool(master['pki_skip_installation']): pkilogging.pki_log.info(log.SKIP_SUBSYSTEM_SPAWN_1, __name__, extra=PKIConfig.PKI_INDENTATION_LEVEL_1) return self.rv diff --git a/base/deploy/src/scriptlets/webapp_deployment.py b/base/deploy/src/scriptlets/webapp_deployment.py index 3f487be58..d707d48ea 100644 --- a/base/deploy/src/scriptlets/webapp_deployment.py +++ b/base/deploy/src/scriptlets/webapp_deployment.py @@ -39,7 +39,7 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): def spawn(self): if master['pki_subsystem'] in PKIConfig.PKI_TOMCAT_SUBSYSTEMS: - if config.str2bool(master['pki_skip_installation']): + if util.str2bool(master['pki_skip_installation']): pkilogging.pki_log.info(log.SKIP_WEBAPP_DEPLOYMENT_SPAWN_1, __name__, extra=PKIConfig.PKI_INDENTATION_LEVEL_1) -- cgit