diff options
| author | Matthew Harmsen <mharmsen@redhat.com> | 2012-08-01 21:36:28 -0700 |
|---|---|---|
| committer | Matthew Harmsen <mharmsen@redhat.com> | 2012-08-02 10:43:30 -0700 |
| commit | e0a57d039dec42526e5f3241a0439b04f17d4ee5 (patch) | |
| tree | b95183bb6751ec8f2ef1eaa6053bb99d3200fa6b /base/deploy/src/scriptlets/infrastructure_layout.py | |
| parent | f3673e8b8cc44fa15a4829784e6ea8e45d764f91 (diff) | |
| download | pki-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/infrastructure_layout.py')
| -rw-r--r-- | base/deploy/src/scriptlets/infrastructure_layout.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/base/deploy/src/scriptlets/infrastructure_layout.py b/base/deploy/src/scriptlets/infrastructure_layout.py index 4baada902..586cc88b7 100644 --- a/base/deploy/src/scriptlets/infrastructure_layout.py +++ b/base/deploy/src/scriptlets/infrastructure_layout.py @@ -98,7 +98,7 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): # remove top-level infrastructure base if not config.pki_dry_run_flag: if master['pki_subsystem'] in config.PKI_SUBSYSTEMS and\ - util.instance.pki_subsystem_instances() == 0: + util.instance.pki_instance_subsystems() == 0: # remove top-level infrastructure base util.directory.delete(master['pki_path']) # do NOT remove top-level infrastructure logs @@ -114,7 +114,7 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): else: # ALWAYS display correct information (even during dry_run) if master['pki_subsystem'] in config.PKI_SUBSYSTEMS and\ - util.instance.pki_subsystem_instances() == 1: + util.instance.pki_instance_subsystems() == 1: # remove top-level infrastructure base util.directory.delete(master['pki_path']) # do NOT remove top-level infrastructure logs |