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

templates/chrony.conf.erb

@@ -4,14 +4,8 @@
 ###    original chrony.conf file can be found at https://3for.me/2t0an       ### 
 ################################################################################
 
-<%  if @fqdn == @cy_server_fqdn -%>
-# This is a time server configuration file
-<% @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 %>