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

doc/puppet_classes/confdroid_ntp_3A_3Aparams.html

@@ -216,10 +216,7 @@
 35
 36
 37
-38
+38</pre>
-39
-40
-41</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/params.pp', line 13</span>
@@ -235,11 +232,8 @@ class confdroid_ntp::params (
   Array $cy_conf_servers    = [&#39;0.pool.ntp.org&#39;, &#39;1.pool.ntp.org&#39;, &#39;2.pool.ntp.org&#39;, &#39;3.pool.ntp.org&#39;],
 
 ) {
-# facts
+# defaults
   $fqdn                     = $facts[&#39;networking&#39;][&#39;fqdn&#39;]
-  $domain                   = $facts[&#39;networking&#39;][&#39;domain&#39;]
-  $os_name                  = $facts[&#39;os&#39;][&#39;name&#39;]
-  $os_release               = $facts[&#39;os&#39;][&#39;release&#39;][&#39;major&#39;]
 
 # dirs
 

manifests/params.pp

@@ -21,11 +21,8 @@ class confdroid_ntp::params (
   Array $cy_conf_servers    = ['0.pool.ntp.org', '1.pool.ntp.org', '2.pool.ntp.org', '3.pool.ntp.org'],
 
 ) {
-# facts
+# defaults
   $fqdn                     = $facts['networking']['fqdn']
-  $domain                   = $facts['networking']['domain']
-  $os_name                  = $facts['os']['name']
-  $os_release               = $facts['os']['release']['major']
 
 # dirs
 

templates/chrony.conf.erb

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