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

templates/chrony.conf.erb

@@ -6,14 +6,12 @@
 
 <%  if @fqdn == @cy_server_fqdn -%>
 # This is a time server configuration file
-#<% @cy_conf_servers.each do |this_server| -%>
+<% @cy_conf_servers.each do |this_server| -%>
-#pool <%= this_server %> iburst
+pool <%= this_server %> iburst
 <% end -%>
 
-<% if @fqdn != @cy_server_fqdn -%>
+<% else -%>
 # This is a time client configuration file
 <% end -%>
 
-#<% end -%>
-
 # <%= @fqdn %>