replicainstall: DS SSL replica install pick right certmonger host

Extend fix 0f31564b35 to also move
the DS SSL setup so that the xmlrpc_uri is configured to point
to the remote master we are configuring against.

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

Signed-off-by: Rob Crittenden <rcritten@redhat.com>
Reviewed-By: Christian Heimes <cheimes@redhat.com>
This commit is contained in:
Rob Crittenden 2018-07-06 09:26:19 -04:00 committed by Christian Heimes
parent 8fa767622f
commit f29412729e

View File

@ -1447,15 +1447,12 @@ def install(installer):
pkcs12_info=pkinit_pkcs12_info, pkcs12_info=pkinit_pkcs12_info,
promote=promote) promote=promote)
# we now need to enable ssl on the ds
ds.enable_ssl()
if promote: if promote:
# We need to point to the master when certmonger asks for # We need to point to the master when certmonger asks for
# HTTP certificate. # a DS or HTTP certificate.
# During http installation, the HTTP/hostname principal is created # During http installation, the <service>/hostname principal is
# locally then the installer waits for the entry to appear on the # created locally then the installer waits for the entry to appear
# master selected for the installation. # on the master selected for the installation.
# In a later step, the installer requests a SSL certificate through # In a later step, the installer requests a SSL certificate through
# Certmonger (and the op adds the principal if it does not exist yet). # Certmonger (and the op adds the principal if it does not exist yet).
# If xmlrpc_uri points to the soon-to-be replica, # If xmlrpc_uri points to the soon-to-be replica,
@ -1469,6 +1466,9 @@ def install(installer):
create_ipa_conf(fstore, config, ca_enabled, create_ipa_conf(fstore, config, ca_enabled,
master=config.master_host_name) master=config.master_host_name)
# we now need to enable ssl on the ds
ds.enable_ssl()
install_http( install_http(
config, config,
auto_redirect=not options.no_ui_redirect, auto_redirect=not options.no_ui_redirect,