|
 |
979ee0 |
From f084ab0a6828efd8d76b4495e800f7cc7158d909 Mon Sep 17 00:00:00 2001
|
|
|
979ee0 |
From: Christian Heimes <cheimes@redhat.com>
|
|
|
979ee0 |
Date: Tue, 19 Jun 2018 19:10:27 +0200
|
|
|
979ee0 |
Subject: [PATCH] Always set ca_host when installing replica
|
|
|
979ee0 |
|
|
|
979ee0 |
ipa-replica-install only set ca_host in its temporary
|
|
|
979ee0 |
/etc/ipa/default.conf, when it wasn't installing a replica with CA. As a
|
|
|
979ee0 |
consequence, the replica installer was picking a random CA server from
|
|
|
979ee0 |
LDAP.
|
|
|
979ee0 |
|
|
|
979ee0 |
Always set the replication peer as ca_host. This will ensure that the
|
|
|
979ee0 |
installer uses the same replication peer for CA. In case the replication
|
|
|
979ee0 |
peer is not a CA master, the installer will automatically pick another
|
|
|
979ee0 |
host later.
|
|
|
979ee0 |
|
|
|
979ee0 |
See: https://pagure.io/freeipa/issue/7566
|
|
|
979ee0 |
Signed-off-by: Christian Heimes <cheimes@redhat.com>
|
|
|
979ee0 |
Reviewed-By: Fraser Tweedale <ftweedal@redhat.com>
|
|
|
979ee0 |
---
|
|
|
979ee0 |
ipaserver/install/server/replicainstall.py | 6 ++----
|
|
|
979ee0 |
1 file changed, 2 insertions(+), 4 deletions(-)
|
|
|
979ee0 |
|
|
|
979ee0 |
diff --git a/ipaserver/install/server/replicainstall.py b/ipaserver/install/server/replicainstall.py
|
|
|
979ee0 |
index 8668859ba5da427ea6e752ed52af057635061f23..b10f761e3f643f9fa868451192fa4550b24b6b16 100644
|
|
|
979ee0 |
--- a/ipaserver/install/server/replicainstall.py
|
|
|
979ee0 |
+++ b/ipaserver/install/server/replicainstall.py
|
|
|
979ee0 |
@@ -236,11 +236,9 @@ def create_ipa_conf(fstore, config, ca_enabled, master=None):
|
|
|
979ee0 |
gopts.extend([
|
|
|
979ee0 |
ipaconf.setOption('enable_ra', 'True'),
|
|
|
979ee0 |
ipaconf.setOption('ra_plugin', 'dogtag'),
|
|
|
979ee0 |
- ipaconf.setOption('dogtag_version', '10')
|
|
|
979ee0 |
+ ipaconf.setOption('dogtag_version', '10'),
|
|
|
979ee0 |
+ ipaconf.setOption('ca_host', config.ca_host_name)
|
|
|
979ee0 |
])
|
|
|
979ee0 |
-
|
|
|
979ee0 |
- if not config.setup_ca:
|
|
|
979ee0 |
- gopts.append(ipaconf.setOption('ca_host', config.ca_host_name))
|
|
|
979ee0 |
else:
|
|
|
979ee0 |
gopts.extend([
|
|
|
979ee0 |
ipaconf.setOption('enable_ra', 'False'),
|
|
|
979ee0 |
--
|
|
|
979ee0 |
2.17.1
|
|
|
979ee0 |
|