IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

install: merge all CA install code paths into one

Browse Source 
Merge CA install code paths use in ipa-server-install, ipa-replica-install
in either domain level and ipa-ca-install into one.

https://fedorahosted.org/freeipa/ticket/6392

Reviewed-By: Stanislav Laznicka <slaznick@redhat.com>
This commit is contained in:
Jan Cholasta
2016-10-24 14:33:19 +02:00
parent 0e232b5f52
commit dc38d53de1
4 changed files with 111 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ipaserver/install/server/replicainstall.py
View File

@@ -820,10 +820,6 @@ def install(installer):
options.realm_name = config.realm_name
options.domain_name = config.domain_name
options.host_name = config.host_name
if ca_enabled:
options.ra_p12 = config.dir + "/ra.p12"
ca.install_step_0(False, config, options)
krb = install_krb(config, setup_pkinit=not options.no_pkinit)
@@ -1043,6 +1039,7 @@ def promote_check(installer):
config.master_host_name = api.env.server
config.ca_host_name = api.env.ca_host
config.kra_host_name = config.ca_host_name
config.ca_ds_port = 389
config.setup_ca = options.setup_ca
config.setup_kra = options.setup_kra
config.dir = installer._top_dir
@@ -1295,7 +1292,7 @@ def promote_check(installer):
options.realm_name = config.realm_name
options.host_name = config.host_name
options.subject = config.subject_base
ca.install_check(False, None, options)
ca.install_check(False, config, options)
if config.setup_kra:
try:
@@ -1510,16 +1507,7 @@ def promote(installer):
options.domain_name = config.domain_name
options.host_name = config.host_name
options.dm_password = config.dirman_password
ca_data = (os.path.join(config.dir, 'cacert.p12'),
config.dirman_password)
custodia.get_ca_keys(config.ca_host_name, ca_data[0], ca_data[1])
ca = cainstance.CAInstance(config.realm_name, certs.NSS_DIR,
host_name=config.host_name)
ca.configure_replica(config.ca_host_name,
config.dirman_password,
subject_base=config.subject_base,
ca_cert_bundle=ca_data)
ca.install(False, config, options)
if options.setup_kra:
ca_data = (os.path.join(config.dir, 'kracert.p12'),