summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEndi S. Dewata <edewata@redhat.com>2016-04-27 02:27:57 +0200
committerEndi S. Dewata <edewata@redhat.com>2016-04-30 00:19:28 +0200
commitefaa21dddc68bc4ff60b1c2a24bef9b23b0bb73b (patch)
treef316b7219a9f5eda6752fce4dd627c2661cc9eb1
parent6b857d96515d4c2e0db3c44affe804c5d8aa7b44 (diff)
downloadpki-efaa21dddc68bc4ff60b1c2a24bef9b23b0bb73b.zip
pki-efaa21dddc68bc4ff60b1c2a24bef9b23b0bb73b.tar.gz
pki-efaa21dddc68bc4ff60b1c2a24bef9b23b0bb73b.tar.xz
Removed unused code for existing CA installation.
The print_existing_ca_step_one_information() has been removed from pkispawn since existing CA installation no longer requires two-step operation. https://fedorahosted.org/pki/ticket/1736
-rwxr-xr-xbase/server/sbin/pkispawn17
1 files changed, 1 insertions, 16 deletions
diff --git a/base/server/sbin/pkispawn b/base/server/sbin/pkispawn
index fa14d49..b019d88 100755
--- a/base/server/sbin/pkispawn
+++ b/base/server/sbin/pkispawn
@@ -543,11 +543,7 @@ def main(argv):
step_one = deployer.configuration_file.external_step_one
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:
- print_existing_ca_step_one_information(parser.mdict)
+ print_external_ca_step_one_information(parser.mdict)
else:
print_install_information(parser.mdict)
@@ -676,17 +672,6 @@ def print_external_ca_step_one_information(mdict):
print(log.PKI_SPAWN_INFORMATION_FOOTER)
-def print_existing_ca_step_one_information(mdict):
-
- print(log.PKI_SPAWN_INFORMATION_HEADER)
- print(" The %s subsystem of the '%s' instance is still incomplete." %
- (config.pki_subsystem, mdict['pki_instance_name']))
- print()
- print(" Import an existing CA certificate with the key and the CSR, and\n"
- " the certificate chain if available, then continue the installation.")
- print(log.PKI_SPAWN_INFORMATION_FOOTER)
-
-
def print_install_information(mdict):
skip_configuration = config.str2bool(mdict['pki_skip_configuration'])