IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-01-13 01:31:56 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix CA topology warning

Browse Source 
Commit 7284097eed kept
find_providing_servers('CA') call before enable_services(). Therefore the
list of known CA servers did not contain the current replica.
ipa-replica-install on the first replica with --setup-ca still printed
the CA topology warning.

See: https://pagure.io/freeipa/issue/7566
Signed-off-by: Christian Heimes <cheimes@redhat.com>
Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
This commit is contained in:
Christian Heimes 2018-07-06 15:07:27 +02:00
parent e32cfd14a9
commit 8fa767622f
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1523,8 +1523,6 @@ def install(installer):
if options.setup_adtrust: if options.setup_adtrust:
adtrust.install(False, options, fstore, api) adtrust.install(False, options, fstore, api)
ca_servers = service.find_providing_servers('CA', api.Backend.ldap2, api)
if not promote: if not promote:
# Call client install script # Call client install script
service.print_msg("Configuring client side components") service.print_msg("Configuring client side components")
@ -1555,6 +1553,7 @@ def install(installer):
# Enable configured services and update DNS SRV records # Enable configured services and update DNS SRV records
service.enable_services(config.host_name) service.enable_services(config.host_name)
api.Command.dns_update_system_records() api.Command.dns_update_system_records()
ca_servers = service.find_providing_servers('CA', api.Backend.ldap2, api)
api.Backend.ldap2.disconnect() api.Backend.ldap2.disconnect()
# Everything installed properly, activate ipa service. # Everything installed properly, activate ipa service.

4
ipaserver/install/service.py
View File

@ -63,7 +63,7 @@ SERVICE_LIST = {
} }
CONFIGURED_SERVICE = u'configuredService' CONFIGURED_SERVICE = u'configuredService'
ENABLED_SERVICE = 'enabledService' ENABLED_SERVICE = u'enabledService'
def print_msg(message, output_fd=sys.stdout): def print_msg(message, output_fd=sys.stdout):
@ -676,7 +676,7 @@ class Service(object):
entry_dn = DN(('cn', name), ('cn', fqdn), ('cn', 'masters'), entry_dn = DN(('cn', name), ('cn', fqdn), ('cn', 'masters'),
('cn', 'ipa'), ('cn', 'etc'), ldap_suffix) ('cn', 'ipa'), ('cn', 'etc'), ldap_suffix)
search_kw = {'ipaConfigString': u'enabledService'} search_kw = {'ipaConfigString': ENABLED_SERVICE}
filter = api.Backend.ldap2.make_filter(search_kw) filter = api.Backend.ldap2.make_filter(search_kw)
try: try:
entries, _truncated = api.Backend.ldap2.find_entries( entries, _truncated = api.Backend.ldap2.find_entries(