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

ipa client: use NTP servers detected from SRV

Browse Source 
Detected NTP servers from SRV records should be used in NTP client
configuration.

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

Reviewed-By: Martin Babinsky <mbabinsk@redhat.com>
This commit is contained in:
Martin Basti 2015-04-15 14:32:17 +02:00 committed by Petr Vobornik
parent e395bdb911
commit e55d8ee5d4
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ipa-client/ipa-install/ipa-client-install
View File

@ -2340,6 +2340,7 @@ def install(options, env, fstore, statestore):
# hostname if different from system hostname
tasks.backup_and_replace_hostname(fstore, statestore, options.hostname)
ntp_srv_servers = []
if not options.on_master and options.conf_ntp:
# Attempt to sync time with IPA server.
# If we're skipping NTP configuration, we also skip the time sync here.
@ -2852,10 +2853,16 @@ def install(options, env, fstore, statestore):
# disable other time&date services first
if options.force_ntpd:
ipaclient.ntpconf.force_ntpd(statestore)
if options.ntp_servers:
if options.ntp_server:
ntp_servers = options.ntp_servers
elif ntp_srv_servers:
ntp_servers = ntp_srv_servers
else:
root_logger.warning("No SRV records of NTP servers found. IPA "
"server address will be used")
ntp_servers = cli_server
ipaclient.ntpconf.config_ntp(ntp_servers, fstore, statestore)
root_logger.info("NTP enabled")