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

templates/chrony.conf.erb

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