summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEndi Sukma Dewata <edewata@redhat.com>2012-11-15 03:29:35 -0500
committerEndi Sukma Dewata <edewata@redhat.com>2012-11-15 03:29:35 -0500
commita1a78a64b715f5b6faa0063372c1de43a9fe5fb5 (patch)
treeaef91cc46e16fe0cd6b26d8d753d760be5dacd85
parent52d2c8bbcf79731570274304bffdb1e1431e5042 (diff)
downloadpki-ticket-399-2.zip
pki-ticket-399-2.tar.gz
pki-ticket-399-2.tar.xz
Fixed str2bool() in scriptlets.ticket-399-2
-rw-r--r--base/deploy/src/scriptlets/configuration.py4
-rw-r--r--base/deploy/src/scriptlets/finalization.py10
-rw-r--r--base/deploy/src/scriptlets/infrastructure_layout.py2
-rw-r--r--base/deploy/src/scriptlets/initialization.py2
-rw-r--r--base/deploy/src/scriptlets/instance_layout.py2
-rw-r--r--base/deploy/src/scriptlets/security_databases.py2
-rw-r--r--base/deploy/src/scriptlets/selinux_setup.py2
-rw-r--r--base/deploy/src/scriptlets/slot_substitution.py2
-rw-r--r--base/deploy/src/scriptlets/subsystem_layout.py2
-rw-r--r--base/deploy/src/scriptlets/webapp_deployment.py2
10 files changed, 15 insertions, 15 deletions
diff --git a/base/deploy/src/scriptlets/configuration.py b/base/deploy/src/scriptlets/configuration.py
index 07914b9..c9a6888 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 f11e2ed..36068c1 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 5e86710..7726133 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 b64f52f..abd192b 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 aae9c0a..0caad1d 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 5e4cb71..19da1d5 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 1305939..57c335e 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 7e3971a..e0451f3 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 65b760f..22d5699 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 3f487be..d707d48 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)