diff options
| author | Martin Basti <mbasti@redhat.com> | 2015-04-14 18:56:47 +0200 |
|---|---|---|
| committer | Petr Vobornik <pvoborni@redhat.com> | 2015-04-24 15:36:07 +0200 |
| commit | e395bdb911ebf69fbf6b3e1c9e0e148a9600bd90 (patch) | |
| tree | d3c3e880eb5e0d179d605e3754e7baa7f71cb790 /ipa-client/ipaclient | |
| parent | 9bd181b33d263d8edf7a900fc925779e0c4fadda (diff) | |
| download | freeipa-e395bdb911ebf69fbf6b3e1c9e0e148a9600bd90.tar.gz freeipa-e395bdb911ebf69fbf6b3e1c9e0e148a9600bd90.tar.xz freeipa-e395bdb911ebf69fbf6b3e1c9e0e148a9600bd90.zip | |
ipa client: make --ntp-server option multivalued
There can be more ntp servers in ntp.conf
Required for ticket: https://fedorahosted.org/freeipa/ticket/4981
Reviewed-By: Martin Babinsky <mbabinsk@redhat.com>
Diffstat (limited to 'ipa-client/ipaclient')
| -rw-r--r-- | ipa-client/ipaclient/ntpconf.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/ipa-client/ipaclient/ntpconf.py b/ipa-client/ipaclient/ntpconf.py index 7d5c82a89..c22fba401 100644 --- a/ipa-client/ipaclient/ntpconf.py +++ b/ipa-client/ipaclient/ntpconf.py @@ -41,7 +41,7 @@ restrict -6 ::1 # Use public servers from the pool.ntp.org project. # Please consider joining the pool (http://www.pool.ntp.org/join.html). -server $SERVER +$SERVERS_BLOCK #broadcast 192.168.1.255 key 42 # broadcast server #broadcastclient # broadcast client @@ -84,7 +84,7 @@ SYNC_HWCLOCK=yes NTPDATE_OPTIONS="" """ ntp_step_tickers = """# Use IPA-provided NTP server for initial time -$SERVER +$TICKER_SERVERS_BLOCK """ def __backup_config(path, fstore = None): if fstore: @@ -97,12 +97,13 @@ def __write_config(path, content): fd.write(content) fd.close() -def config_ntp(server_fqdn, fstore = None, sysstore = None): +def config_ntp(ntp_servers, fstore = None, sysstore = None): path_step_tickers = paths.NTP_STEP_TICKERS path_ntp_conf = paths.NTP_CONF path_ntp_sysconfig = paths.SYSCONFIG_NTPD - sub_dict = { } - sub_dict["SERVER"] = server_fqdn + sub_dict = {} + sub_dict["SERVERS_BLOCK"] = "\n".join("server %s" % s for s in ntp_servers) + sub_dict["TICKER_SERVERS_BLOCK"] = "\n".join(ntp_servers) nc = ipautil.template_str(ntp_conf, sub_dict) config_step_tickers = False |