Merge remote-tracking branch 'origin/master' into jenkins-build-19

templates/chrony.conf.erb

@@ -6,35 +6,11 @@
 
 <%  if @fqdn == @cy_server_fqdn -%>
 # This is a time server configuration file
-# Use public servers from the pool.ntp.org project.
-<% @cy_conf_servers.each do |this_server| -%>
-pool <%= this_server %> iburst
-
-# Use NTP servers from DHCP.
-sourcedir /run/chrony-dhcp
-
-# Record the rate at which the system clock gains/losses time.
-driftfile /var/lib/chrony/drift
-
-# Allow the system clock to be stepped in the first three updates
-# if its offset is larger than 1 second.
-makestep 1.0 3
-
+#<% @cy_conf_servers.each do |this_server| -%>
+#pool <%= this_server %> iburst
 <% end end -%>
 
 
 <% if @fqdn != @cy_server_fqdn -%>
 # This is a time client configuration file
-server <%= @cy_server_fqdn %> iburst
-
-# Use NTP servers from DHCP.
-sourcedir /run/chrony-dhcp
-
-# Record the rate at which the system clock gains/losses time.
-driftfile /var/lib/chrony/drift
-
-# Allow the system clock to be stepped in the first three updates
-# if its offset is larger than 1 second.
-makestep 1.0 3
-
 <% end %>