Merge pull request voxpupuli#228 from cirrax/dev_cirrax

Allow to specify options on Debian systems

Author: trefzer

REFERENCE.md

@@ -880,23 +880,23 @@ Default value: `undef`
 
 Data type: `Optional[Stdlib::Absolutepath]`
 
-The full path to the chronyd options file, typically /etc/sysconfig/chronyd
+The full path to the chronyd options file, typically /etc/sysconfig/chronyd on RedHat, /etc/default/chrony on Debian
 
 Default value: `undef`
 
 ##### <a name="-chrony--options"></a>`options`
 
-Data type: `Optional[String[1]]`
+Data type: `Optional[String]`
 
-Options to pass to the chrony daemon via /etc/sysconfig/chronyd file.
+Options to pass to the chrony daemon via $options_file file.
 
 Default value: `undef`
 
 ##### <a name="-chrony--options_template"></a>`options_template`
 
 Data type: `String[1]`
 
-This determines which template puppet should use for the chrony options (sysconfig) file.
+This determines which template puppet should use for the chrony options (sysconfig|default) file.
 
 Default value: `'chrony/chronyd.epp'`
 

data/Debian.yaml

@@ -5,3 +5,5 @@ chrony::leapsectz: right/UTC
 chrony::makestep_seconds: 1
 chrony::maxupdateskew: 100.0
 chrony::ntsdumpdir: /var/lib/chrony
+chrony::options_template: chrony/chronyd_default.epp
+chrony::options_file: /etc/default/chrony

data/RedHat.yaml

@@ -4,3 +4,4 @@ chrony::config_keys: /etc/chrony.keys
 chrony::config: /etc/chrony.conf
 chrony::wait_manage: true
 chrony::options_file: /etc/sysconfig/chronyd
+chrony::options: ''

manifests/config.pp

@@ -36,7 +36,7 @@
     }
   }
 
-  if $chrony::options_file {
+  if $chrony::options_file and $chrony::options {
     file { $chrony::options_file:
       ensure  => file,
       owner   => 0,

manifests/init.pp

@@ -256,11 +256,11 @@
 # @param acquisitionport
 #   Sets the acquisitionport for client queries
 # @param options_file
-#   The full path to the chronyd options file, typically /etc/sysconfig/chronyd
+#   The full path to the chronyd options file, typically /etc/sysconfig/chronyd on RedHat, /etc/default/chrony on Debian
 # @param options
-#   Options to pass to the chrony daemon via /etc/sysconfig/chronyd file.
+#   Options to pass to the chrony daemon via $options_file file.
 # @param options_template
-#   This determines which template puppet should use for the chrony options (sysconfig) file.
+#   This determines which template puppet should use for the chrony options (sysconfig|default) file.
 # @param ptpport
 #   open port to send and receive NTP messages contained in PTP event messages (NTP-over-PTP)
 # @param ptpdomain
@@ -348,7 +348,7 @@
   Optional[Integer[0]] $ntsrotate                                  = undef,
   Optional[Integer[1,65535]] $acquisitionport                      = undef,
   Optional[Stdlib::Absolutepath] $options_file                     = undef,
-  Optional[String[1]] $options                                     = undef,
+  Optional[String] $options                                        = undef,
   String[1] $options_template                                      = 'chrony/chronyd.epp',
   Optional[Integer[0]] $ptpport                                    = undef,
   Optional[Integer[0,255]] $ptpdomain                              = undef,

spec/classes/chrony_spec.rb

@@ -415,6 +415,10 @@
             )
           end
 
+          it 'does not create /etc/default/chrony' do
+            is_expected.not_to contain_file('/etc/default/chrony')
+          end
+
           if (facts[:os]['release']['major'] = '8')
             context 'on RedHat 8 family with default parameters' do
               it 'contains an empty OPTIONS line' do
@@ -439,9 +443,33 @@
                 with_content(%r{^OPTIONS="-4 -u chrony"$})
             end
           end
+        when 'Debian'
+          it 'does not create /etc/sysconfig/chronyd' do
+            is_expected.not_to contain_file('/etc/sysconfig/chronyd')
+          end
+
+          context 'with no options parameter' do
+            it {
+              is_expected.not_to contain_file('/etc/default/chrony')
+            }
+          end
+
+          context 'with custom options parameter' do
+            let(:params) { { options: '-4 -u chrony' } }
+
+            it 'contains the custom OPTIONS line' do
+              is_expected.to contain_file('/etc/default/chrony').
+                with_content(%r{^DAEMON_OPTS="-4 -u chrony"$}).
+                with_ensure('file').
+                with_owner('0').
+                with_group('0').
+                with_mode('0644')
+            end
+          end
         else
-          it 'on non-RedHat families' do
+          it 'on non-RedHat/Debian families' do
             is_expected.not_to contain_file('/etc/sysconfig/chronyd')
+            is_expected.not_to contain_file('/etc/default/chrony')
           end
         end
       end

templates/chronyd_default.epp

@@ -0,0 +1,3 @@
+# This file is managed by Puppet.  Do not edit!
+# Command-line options for chronyd
+DAEMON_OPTS="<%= $chrony::options %>"