Skip to content

Commit eda38d5

Browse files
committed
Drop pki_existing param
The pki_existing param is actually redundant and can be removed safely. Remaining references to this param in pkispawn have been removed. The pkiparser.py has been modified to deprecate this param. The CI tests have been updated to no longer use it.
1 parent da25445 commit eda38d5

File tree

8 files changed

+8
-8
lines changed

8 files changed

+8
-8
lines changed

.github/workflows/ca-existing-hsm-test.yml

-1
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,6 @@ jobs:
272272
-f /usr/share/pki/server/examples/installation/ca.cfg \
273273
-s CA \
274274
-D pki_ds_url=ldap://ds.example.com:3389 \
275-
-D pki_existing=True \
276275
-D pki_hsm_enable=True \
277276
-D pki_token_name=HSM \
278277
-D pki_token_password=Secret.HSM \

.github/workflows/ca-existing-nssdb-test.yml

-1
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,6 @@ jobs:
199199
-f /usr/share/pki/server/examples/installation/ca.cfg \
200200
-s CA \
201201
-D pki_ds_url=ldap://ds.example.com:3389 \
202-
-D pki_existing=True \
203202
-D pki_admin_cert_path=admin.crt \
204203
-D pki_admin_csr_path=admin.csr \
205204
-v

base/ca/bin/pki-ca-run

-1
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,6 @@ pkispawn \
315315
-D pki_ds_setup=False \
316316
-D pki_skip_ds_verify=True \
317317
-D pki_share_db=True \
318-
-D pki_existing=True \
319318
-D pki_import_system_certs=False \
320319
-D pki_ca_signing_nickname=ca_signing \
321320
-D pki_ca_signing_csr_path=/certs/ca_signing.csr \

base/server/etc/default.cfg

-1
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,6 @@ pki_use_oaep_rsa_keywrap=False
149149
pki_token_name=
150150
pki_token_password=
151151
pki_user=pkiuser
152-
pki_existing=False
153152

154153
# DEPRECATED: Use 'pki_cert_chain_path' instead.
155154
pki_external_ca_cert_chain_path=

base/server/python/pki/server/deployment/__init__.py

+1-3
Original file line numberDiff line numberDiff line change
@@ -3245,8 +3245,7 @@ def setup_system_cert(self, nssdb, subsystem, tag, system_cert, request):
32453245
#
32463246
# A new SSL server cert will always be created separately later.
32473247

3248-
external = config.str2bool(self.mdict['pki_external']) or \
3249-
config.str2bool(self.mdict['pki_existing'])
3248+
external = config.str2bool(self.mdict['pki_external'])
32503249

32513250
if subsystem.type == 'CA' and external and cert_info:
32523251

@@ -3391,7 +3390,6 @@ def setup_system_certs(self, nssdb, subsystem):
33913390
num_subsystems = len(self.instance.get_subsystems())
33923391

33933392
external = config.str2bool(self.mdict['pki_external']) or \
3394-
config.str2bool(self.mdict['pki_existing']) or \
33953393
config.str2bool(self.mdict['pki_standalone'])
33963394

33973395
tags = subsystem.config['%s.cert.list' % subsystem.name].split(',')

base/server/python/pki/server/deployment/pkihelper.py

-1
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,6 @@ def __init__(self, deployer):
298298
# include SKI extension in CSR - for external CA
299299
self.req_ski = self.mdict.get('pki_req_ski')
300300

301-
self.existing = config.str2bool(self.mdict['pki_existing'])
302301
self.external = config.str2bool(self.mdict['pki_external'])
303302
self.external_step_one = not config.str2bool(
304303
self.mdict['pki_external_step_two'])

base/server/python/pki/server/deployment/pkiparser.py

+2
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,8 @@ class PKIConfigParser:
9494
None, 'pki_ajp_host_ipv4'),
9595
(None, 'pki_restart_configured_instance',
9696
None, None),
97+
(None, 'pki_existing',
98+
None, None),
9799
]
98100

99101
DEPRECATED_CA_PARAMS = [

docs/changes/v11.6.0/Server-Changes.adoc

+5
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,8 @@
44

55
The `<subsystem>.admin.cert` parameter in `CS.cfg` is no longer used
66
so it has been removed.
7+
8+
== Remove pki_existing parameter ==
9+
10+
The `pki_existing` parameter is no longer used by `pkispawn`
11+
so it has been removed.

0 commit comments

Comments
 (0)