On 16/04/15 13:36, Martin Babinsky wrote:
On 04/15/2015 04:18 PM, Martin Basti wrote:
https://fedorahosted.org/freeipa/ticket/4983
Patch attached.
NACK until you fix PATCH 224.
Updated patch attached.
--
Martin Basti
From f1ec7e88a1218fe18a9ca253c5d90197da440330 Mon Sep 17 00:00:00 2001
From: Martin Basti <[email protected]>
Date: Wed, 15 Apr 2015 15:06:45 +0200
Subject: [PATCH] ipa client: use NTP servers specified by user
NTP servers specified by user should be used to synchronize time.
https://fedorahosted.org/freeipa/ticket/4983
---
ipa-client/ipa-install/ipa-client-install | 24 +++++++++++++++---------
1 file changed, 15 insertions(+), 9 deletions(-)
diff --git a/ipa-client/ipa-install/ipa-client-install b/ipa-client/ipa-install/ipa-client-install
index 6cfaa1dd21131b49f99f78ed3df24602b5cf80f3..d3f362afee87491227e0de66cf42ba43890c55be 100755
--- a/ipa-client/ipa-install/ipa-client-install
+++ b/ipa-client/ipa-install/ipa-client-install
@@ -2336,19 +2336,25 @@ def install(options, env, fstore, statestore):
ntp_srv_servers = ds.ipadns_search_srv(cli_domain, '_ntp._udp',
None, break_on_first=False)
synced_ntp = False
- if ntp_srv_servers:
- for s in ntp_srv_servers:
- synced_ntp = ipaclient.ntpconf.synconce_ntp(s)
- if synced_ntp:
- break
- if not synced_ntp:
+ ntp_servers = ntp_srv_servers
+
+ # use user specified NTP servers if there are any
+ if options.ntp_servers:
+ ntp_servers = options.ntp_servers
+
+ for s in ntp_servers:
+ synced_ntp = ipaclient.ntpconf.synconce_ntp(s)
+ if synced_ntp:
+ break
+
+ if not synced_ntp and not options.ntp_servers:
synced_ntp = ipaclient.ntpconf.synconce_ntp(cli_server[0])
if not synced_ntp:
- root_logger.warning("Unable to sync time with IPA NTP " +
+ root_logger.warning("Unable to sync time with NTP " +
"server, assuming the time is in sync. Please check " +
"that 123 UDP port is opened.")
else:
- root_logger.info('Skipping synchronizing time with IPA NTP server.')
+ root_logger.info('Skipping synchronizing time with NTP server.')
if not options.unattended:
if (options.principal is None and options.password is None and
@@ -2843,7 +2849,7 @@ def install(options, env, fstore, statestore):
if options.force_ntpd:
ipaclient.ntpconf.force_ntpd(statestore)
- if options.ntp_server:
+ if options.ntp_servers:
ntp_servers = options.ntp_servers
elif ntp_srv_servers:
ntp_servers = ntp_srv_servers
--
2.1.0
--
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
