34 lines
1.5 KiB
Diff
34 lines
1.5 KiB
Diff
From 80514f225f628f7c7993b85e562a851e7ee40644 Mon Sep 17 00:00:00 2001
|
|
From: Nathan Kinder <nkinder@redhat.com>
|
|
Date: Wed, 25 Feb 2015 14:22:02 -0800
|
|
Subject: [PATCH 1/2] Skip time sync during client install when using --no-ntp
|
|
|
|
When --no-ntp is specified during ipa-client-install, we still
|
|
attempt to perform a time sync before obtaining a TGT from the
|
|
KDC. We should not be attempting to sync time with the KDC if
|
|
we are explicitly told to not configure ntp.
|
|
|
|
Ticket: https://fedorahosted.org/freeipa/ticket/4842
|
|
---
|
|
ipa-client/ipa-install/ipa-client-install | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/ipa-client/ipa-install/ipa-client-install b/ipa-client/ipa-install/ipa-client-install
|
|
index ccaab55..a625fbd 100755
|
|
--- a/ipa-client/ipa-install/ipa-client-install
|
|
+++ b/ipa-client/ipa-install/ipa-client-install
|
|
@@ -2324,8 +2324,9 @@ def install(options, env, fstore, statestore):
|
|
# hostname if different from system hostname
|
|
tasks.backup_and_replace_hostname(fstore, statestore, options.hostname)
|
|
|
|
- if not options.on_master:
|
|
+ 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.
|
|
# We assume that NTP servers are discoverable through SRV records in the DNS
|
|
# If that fails, we try to sync directly with IPA server, assuming it runs NTP
|
|
root_logger.info('Synchronizing time with KDC...')
|
|
--
|
|
1.9.3
|
|
|