summaryrefslogtreecommitdiffstats
path: root/base/deploy/src/scriptlets/finalization.py
diff options
context:
space:
mode:
authorMatthew Harmsen <mharmsen@redhat.com>2012-08-01 21:36:28 -0700
committerMatthew Harmsen <mharmsen@redhat.com>2012-08-02 10:43:30 -0700
commite0a57d039dec42526e5f3241a0439b04f17d4ee5 (patch)
treeb95183bb6751ec8f2ef1eaa6053bb99d3200fa6b /base/deploy/src/scriptlets/finalization.py
parentf3673e8b8cc44fa15a4829784e6ea8e45d764f91 (diff)
downloadpki-e0a57d039dec42526e5f3241a0439b04f17d4ee5.tar.gz
pki-e0a57d039dec42526e5f3241a0439b04f17d4ee5.tar.xz
pki-e0a57d039dec42526e5f3241a0439b04f17d4ee5.zip
PKI Deployment Scriptlets
* PKI TRAC Ticket #279 - Dogtag 10: Fix remaining 'cloning' issues in 'pkispawn' . . . * PKI TRAC Ticket #280 - Dogtag 10: Fix remaining issues in 'pkidestroy' related to deletion of more than one instance . . . * PKI TRAC Ticket #281 - Dogtag 10: Fix 'pkidaemon'/'operations' issue to handle individual instance . . .
Diffstat (limited to 'base/deploy/src/scriptlets/finalization.py')
-rw-r--r--base/deploy/src/scriptlets/finalization.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/base/deploy/src/scriptlets/finalization.py b/base/deploy/src/scriptlets/finalization.py
index ab66cd74a..05fd47c63 100644
--- a/base/deploy/src/scriptlets/finalization.py
+++ b/base/deploy/src/scriptlets/finalization.py
@@ -129,18 +129,18 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet):
# Start this Apache/Tomcat PKI Process
if not config.pki_dry_run_flag:
if master['pki_subsystem'] in config.PKI_APACHE_SUBSYSTEMS and\
- util.instance.apache_instances() >= 1:
+ util.instance.apache_instance_subsystems() >= 1:
util.systemd.start()
elif master['pki_subsystem'] in config.PKI_TOMCAT_SUBSYSTEMS and\
- util.instance.tomcat_instances() >= 1:
+ util.instance.tomcat_instance_subsystems() >= 1:
util.systemd.start()
else:
# ALWAYS display correct information (even during dry_run)
if master['pki_subsystem'] in config.PKI_APACHE_SUBSYSTEMS and\
- util.instance.apache_instances() >= 0:
+ util.instance.apache_instance_subsystems() >= 0:
util.systemd.start()
elif master['pki_subsystem'] in config.PKI_TOMCAT_SUBSYSTEMS and\
- util.instance.tomcat_instances() >= 0:
+ util.instance.tomcat_instance_subsystems() >= 0:
util.systemd.start()
config.pki_log.info(log.PKIDESTROY_END_MESSAGE_2,
master['pki_subsystem'],