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/configuration.jy | |
| 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/configuration.jy')
| -rw-r--r-- | base/deploy/src/scriptlets/configuration.jy | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/base/deploy/src/scriptlets/configuration.jy b/base/deploy/src/scriptlets/configuration.jy index d06119ada..290a2cc65 100644 --- a/base/deploy/src/scriptlets/configuration.jy +++ b/base/deploy/src/scriptlets/configuration.jy @@ -97,42 +97,35 @@ def main(argv): (log.PKI_JYTHON_INDENTATION_2, master['pki_subsystem'], log.PKI_JYTHON_NOT_YET_IMPLEMENTED) - return self.rv + return rv elif master['pki_subsystem'] == "TPS": print "%s '%s' %s" %\ (log.PKI_JYTHON_INDENTATION_2, master['pki_subsystem'], log.PKI_JYTHON_NOT_YET_IMPLEMENTED) - return self.rv + return rv elif master['pki_instance_type'] == "Tomcat": if master['pki_subsystem'] == "CA": - if config.str2bool(master['pki_clone']): - print "%s '%s %s' %s" %\ - (log.PKI_JYTHON_INDENTATION_2, - log.PKI_JYTHON_CLONED_PKI_SUBSYSTEM, - master['pki_subsystem'], - log.PKI_JYTHON_NOT_YET_IMPLEMENTED) - return self.rv - elif config.str2bool(master['pki_external']): + if config.str2bool(master['pki_external']): print "%s '%s %s' %s" %\ (log.PKI_JYTHON_INDENTATION_2, log.PKI_JYTHON_EXTERNAL_CA, master['pki_subsystem'], log.PKI_JYTHON_NOT_YET_IMPLEMENTED) - return self.rv + return rv elif config.str2bool(master['pki_subordinate']): print "%s '%s %s' %s" %\ (log.PKI_JYTHON_INDENTATION_2, log.PKI_JYTHON_SUBORDINATE_CA, master['pki_subsystem'], log.PKI_JYTHON_NOT_YET_IMPLEMENTED) - return self.rv + return rv else: - # CA + # PKI or Cloned CA data = jyutil.rest_client.construct_pki_configuration_data( master, sensitive, token) else: - # KRA, OCSP, or TKS + # PKI or Cloned KRA, OCSP, or TKS data = jyutil.rest_client.construct_pki_configuration_data( master, sensitive, token) |