diff options
| author | Endi S. Dewata <edewata@redhat.com> | 2016-02-02 03:32:50 +0100 |
|---|---|---|
| committer | Matthew Harmsen <mharmsen@pki.usersys.redhat.com> | 2016-02-22 20:20:19 -0700 |
| commit | 1b5d731f46e29c7129f0e985e77b693440754642 (patch) | |
| tree | 6ab377f9465c76a8a64db5c7aa6423c711f30970 | |
| parent | 708189e54a505ce0baf9a96ff3ad8b6a9942936e (diff) | |
| download | pki-1b5d731f46e29c7129f0e985e77b693440754642.tar.gz pki-1b5d731f46e29c7129f0e985e77b693440754642.tar.xz pki-1b5d731f46e29c7129f0e985e77b693440754642.zip | |
Fixed KRA installation.
Due to a recent change the KRA installation failed because the
installer was trying to read the pki_external_csr_path parameter
which is not available for KRA installation. The installer has
been fixed to read the parameter in external CA case only.
https://fedorahosted.org/pki/ticket/456
(cherry picked from commit d42f39334ce4b4f5fa89707bfb6145039ff04579)
| -rw-r--r-- | base/server/python/pki/server/deployment/pkihelper.py | 1 | ||||
| -rw-r--r-- | base/server/python/pki/server/deployment/scriptlets/configuration.py | 3 | ||||
| -rwxr-xr-x | base/server/sbin/pkispawn | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/base/server/python/pki/server/deployment/pkihelper.py b/base/server/python/pki/server/deployment/pkihelper.py index 07a5ce4dd..e8591398d 100644 --- a/base/server/python/pki/server/deployment/pkihelper.py +++ b/base/server/python/pki/server/deployment/pkihelper.py @@ -492,7 +492,6 @@ class ConfigurationFile: self.external = config.str2bool(self.mdict['pki_external']) self.external_step_one = not config.str2bool(self.mdict['pki_external_step_two']) self.external_step_two = not self.external_step_one - self.external_csr_path = self.mdict['pki_external_csr_path'] if self.external: # generic extension support in CSR - for external CA diff --git a/base/server/python/pki/server/deployment/scriptlets/configuration.py b/base/server/python/pki/server/deployment/scriptlets/configuration.py index 54f1c6e60..e7b257f7d 100644 --- a/base/server/python/pki/server/deployment/scriptlets/configuration.py +++ b/base/server/python/pki/server/deployment/scriptlets/configuration.py @@ -96,7 +96,6 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): external = deployer.configuration_file.external step_one = deployer.configuration_file.external_step_one step_two = deployer.configuration_file.external_step_two - external_csr_path = deployer.configuration_file.external_csr_path try: if external and step_one: # external/existing CA step 1 @@ -128,6 +127,7 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): # If filename specified, generate CA cert request and # import it into CS.cfg. + external_csr_path = deployer.mdict['pki_external_csr_path'] if external_csr_path: nssdb.create_request( subject_dn=deployer.mdict['pki_ca_signing_subject_dn'], @@ -150,6 +150,7 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): elif external and step_two: # external/existing CA step 2 # If specified, import existing CA cert request into CS.cfg. + external_csr_path = deployer.mdict['pki_external_csr_path'] if external_csr_path: with open(external_csr_path) as f: signing_csr = f.read() diff --git a/base/server/sbin/pkispawn b/base/server/sbin/pkispawn index 967d5f5e5..7ab11a515 100755 --- a/base/server/sbin/pkispawn +++ b/base/server/sbin/pkispawn @@ -613,9 +613,9 @@ def main(argv): external = deployer.configuration_file.external step_one = deployer.configuration_file.external_step_one - external_csr_path = deployer.configuration_file.external_csr_path if external and step_one: + external_csr_path = deployer.mdict['pki_external_csr_path'] if external_csr_path: print_external_ca_step_one_information(parser.mdict) else: |