diff options
| author | Matthew Harmsen <mharmsen@redhat.com> | 2014-07-24 11:16:56 -0700 |
|---|---|---|
| committer | Matthew Harmsen <mharmsen@redhat.com> | 2014-08-04 14:15:36 -0700 |
| commit | 3cbd3f4fd71bace3e1b5020defba07a3311d082a (patch) | |
| tree | ad1896e2122382b20e1940480a061fa44d58d86f /base/server/python/pki/server/deployment/pkiparser.py | |
| parent | 7227047530a5a809299bf3198f6886776af1742e (diff) | |
| download | pki-3cbd3f4fd71bace3e1b5020defba07a3311d082a.tar.gz pki-3cbd3f4fd71bace3e1b5020defba07a3311d082a.tar.xz pki-3cbd3f4fd71bace3e1b5020defba07a3311d082a.zip | |
Fix independent pkispawn installation and configuration
* PKI TRAC Ticket #905 - 2 Step Configuration of CA instance using
pkispawn fails
Diffstat (limited to 'base/server/python/pki/server/deployment/pkiparser.py')
| -rw-r--r-- | base/server/python/pki/server/deployment/pkiparser.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/base/server/python/pki/server/deployment/pkiparser.py b/base/server/python/pki/server/deployment/pkiparser.py index a0e315d0e..1d201cee9 100644 --- a/base/server/python/pki/server/deployment/pkiparser.py +++ b/base/server/python/pki/server/deployment/pkiparser.py @@ -594,10 +594,16 @@ class PKIConfigParser: self.mdict['pki_target_registry'] = \ os.path.join(self.mdict['pki_instance_registry_path'], self.mdict['pki_instance_name']) - if config.str2bool(self.mdict['pki_external_step_two']): + if config.str2bool(self.mdict['pki_external_step_two']) or\ + config.str2bool(self.mdict['pki_skip_installation']): # For CA (External CA Step 2) and Stand-alone PKI (Step 2), # use the 'pki_one_time_pin' established during the setup # of (Step 1) + # + # Similarly, if the only code being processed is for + # configuration, re-use the 'pki_one_time_pin' generated + # during the installation phase + # if os.path.exists(self.mdict['pki_target_cs_cfg'])\ and\ os.path.isfile(self.mdict['pki_target_cs_cfg']): |