Skip to content

Commit

Permalink
server-install: No double Kerberos install
Browse files Browse the repository at this point in the history
When we're installing server with an external CA, the installation
would have failed in the second step where it's passed the required
CA cert file because it would have tried to perform the Kerberos
installation for the second time.

https://pagure.io/freeipa/issue/6757

Reviewed-By: Jan Cholasta <jcholast@redhat.com>
  • Loading branch information
stlaz authored and Jan Cholasta committed Apr 19, 2017
1 parent 49f9d79 commit 2144eaf
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions ipaserver/install/server/install.py
Expand Up @@ -762,11 +762,12 @@ def install(installer):
options.subject_base, options.ca_subject, 1101, 1100, None)

krb = krbinstance.KrbInstance(fstore)
krb.create_instance(realm_name, host_name, domain_name,
dm_password, master_password,
setup_pkinit=not options.no_pkinit,
pkcs12_info=pkinit_pkcs12_info,
subject_base=options.subject_base)
if not options.external_cert_files:
krb.create_instance(realm_name, host_name, domain_name,
dm_password, master_password,
setup_pkinit=not options.no_pkinit,
pkcs12_info=pkinit_pkcs12_info,
subject_base=options.subject_base)

if setup_ca:
if not options.external_cert_files and options.external_ca:
Expand Down

0 comments on commit 2144eaf

Please sign in to comment.