diff options
author | Nathan Kinder <nkinder@redhat.com> | 2015-02-25 14:22:02 -0800 |
---|---|---|
committer | Petr Vobornik <pvoborni@redhat.com> | 2015-03-26 18:30:19 +0100 |
commit | f0c1daf7a2a8c88f6d84d81d66c7e39f571e0894 (patch) | |
tree | 73ce36b6062fcf0c3c7b4a17576e0a45c62d3923 | |
parent | 1b781b777f534b12a178202afa0982afd2d9c1dd (diff) | |
download | freeipa-f0c1daf7a2a8c88f6d84d81d66c7e39f571e0894.tar.gz freeipa-f0c1daf7a2a8c88f6d84d81d66c7e39f571e0894.tar.xz freeipa-f0c1daf7a2a8c88f6d84d81d66c7e39f571e0894.zip |
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
Reviewed-By: Martin Babinsky <mbabinsk@redhat.com>
-rwxr-xr-x | ipa-client/ipa-install/ipa-client-install | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ipa-client/ipa-install/ipa-client-install b/ipa-client/ipa-install/ipa-client-install index 711fa06e8..e31d83dc9 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...') |