diff options
| author | Matthew Harmsen <mharmsen@redhat.com> | 2012-11-06 18:59:47 -0800 |
|---|---|---|
| committer | Matthew Harmsen <mharmsen@redhat.com> | 2012-11-08 09:57:21 -0800 |
| commit | 1e15712d2a6c45d2dd2ac64b3b76a757ca9de2e8 (patch) | |
| tree | 83a2c5dbaf952e3526a746f0d40db72ea6316dc5 /base/deploy/src/scriptlets/configuration.jy | |
| parent | cb209df95c4dee11f2a912e20b417fa3bc41c88f (diff) | |
| download | pki-1e15712d2a6c45d2dd2ac64b3b76a757ca9de2e8.tar.gz pki-1e15712d2a6c45d2dd2ac64b3b76a757ca9de2e8.tar.xz pki-1e15712d2a6c45d2dd2ac64b3b76a757ca9de2e8.zip | |
Enable Subordinate CA
* TRAC Ticket #185 - Dogtag 10: Update PKI Deployment to handle subordinate CA
Diffstat (limited to 'base/deploy/src/scriptlets/configuration.jy')
| -rw-r--r-- | base/deploy/src/scriptlets/configuration.jy | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/base/deploy/src/scriptlets/configuration.jy b/base/deploy/src/scriptlets/configuration.jy index 0f5968bce..7180c4546 100644 --- a/base/deploy/src/scriptlets/configuration.jy +++ b/base/deploy/src/scriptlets/configuration.jy @@ -109,19 +109,12 @@ def main(argv): 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 rv - elif config.str2bool(master['pki_subordinate']): - print "%s '%s %s' %s" %\ - (log.PKI_JYTHON_INDENTATION_2, - log.PKI_JYTHON_SUBORDINATE_CA, + config.PKI_DEPLOYMENT_EXTERNAL_CA, master['pki_subsystem'], log.PKI_JYTHON_NOT_YET_IMPLEMENTED) return rv else: - # PKI or Cloned CA + # PKI, Subordinate, or Cloned CA data = jyutil.rest_client.construct_pki_configuration_data( token) else: |