diff options
author | Matthew Harmsen <mharmsen@redhat.com> | 2012-12-06 14:23:21 -0800 |
---|---|---|
committer | Matthew Harmsen <mharmsen@redhat.com> | 2012-12-06 14:41:28 -0800 |
commit | 8d5eb937f99fd18398401f3f744eb85775293e23 (patch) | |
tree | fec1f35d9b315f574e6393b402a65585392e23eb /base/deploy/src/scriptlets/finalization.py | |
parent | 6180bb1b8a450d0e69d10c5e9bd85996e2858599 (diff) | |
download | pki-8d5eb937f99fd18398401f3f744eb85775293e23.tar.gz pki-8d5eb937f99fd18398401f3f744eb85775293e23.tar.xz pki-8d5eb937f99fd18398401f3f744eb85775293e23.zip |
Implemented ability to utilize an external CA
* TRAC Ticket #231 - Dogtag 10: Update PKI Deployment to handle external CA
Diffstat (limited to 'base/deploy/src/scriptlets/finalization.py')
-rw-r--r-- | base/deploy/src/scriptlets/finalization.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/base/deploy/src/scriptlets/finalization.py b/base/deploy/src/scriptlets/finalization.py index ec8fa6eff..1a6e731ae 100644 --- a/base/deploy/src/scriptlets/finalization.py +++ b/base/deploy/src/scriptlets/finalization.py @@ -33,7 +33,13 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): rv = 0 def spawn(self): - if config.str2bool(master['pki_skip_installation']): + if master['pki_subsystem'] == "CA" and\ + config.str2bool(master['pki_external_step_two']): + # must check for 'External CA Step 2' installation PRIOR to + # 'pki_skip_installation' since this value has been set to true + # by the initialization scriptlet + pass + elif config.str2bool(master['pki_skip_installation']): config.pki_log.info(log.SKIP_FINALIZATION_SPAWN_1, __name__, extra=config.PKI_INDENTATION_LEVEL_1) return self.rv |