Merge pull request #365 from bastelfreak/validate

Make config file validation optional

Author: bastelfreak

REFERENCE.md

@@ -55,6 +55,7 @@ The following parameters are available in the `keepalived` class:
 * [`config_dir_mode`](#-keepalived--config_dir_mode)
 * [`config_file_mode`](#-keepalived--config_file_mode)
 * [`config_validate_cmd`](#-keepalived--config_validate_cmd)
+* [`validate_config`](#-keepalived--validate_config)
 * [`config_group`](#-keepalived--config_group)
 * [`config_owner`](#-keepalived--config_owner)
 * [`daemon_group`](#-keepalived--daemon_group)
@@ -122,6 +123,14 @@ Input for the `validate_cmd` param of the keepalived.conf concat fragment.
 
 Default value: `'/usr/sbin/keepalived -l -t -f %'`
 
+##### <a name="-keepalived--validate_config"></a>`validate_config`
+
+Data type: `Boolean`
+
+Boolean to enable/disable the config validation
+
+Default value: `true`
+
 ##### <a name="-keepalived--config_group"></a>`config_group`
 
 Data type: `String[1]`

manifests/config.pp

@@ -30,11 +30,16 @@
     owner  => $keepalived::config_owner,
   }
 
+  $validate_cmd = if $keepalived::validate_config {
+    $keepalived::config_validate_cmd
+  } else {
+    undef
+  }
   concat { "${keepalived::config_dir}/keepalived.conf":
     owner        => $keepalived::config_owner,
     group        => $keepalived::config_group,
     mode         => $keepalived::config_file_mode,
-    validate_cmd => $keepalived::config_validate_cmd,
+    validate_cmd => $validate_cmd,
   }
 
   concat::fragment { 'keepalived.conf_header':

manifests/init.pp

@@ -13,6 +13,8 @@
 #
 # @param config_validate_cmd Input for the `validate_cmd` param of the keepalived.conf concat fragment.
 #
+# @param validate_config Boolean to enable/disable the config validation
+#
 # @param config_group
 #
 # @param config_owner
@@ -67,6 +69,7 @@
   Stdlib::Filemode       $config_dir_mode     = '0755',
   Stdlib::Filemode       $config_file_mode    = '0644',
   Stdlib::Absolutepath   $config_validate_cmd = '/usr/sbin/keepalived -l -t -f %',
+  Boolean                $validate_config     = true,
 
   Array[Stdlib::Absolutepath] $include_external_conf_files = [],
 

spec/classes/keepalived_spec.rb

@@ -180,6 +180,14 @@
             )
         }
       end
+
+      describe 'without config validation' do
+        let :params do
+          { validate_config: false }
+        end
+
+        it { is_expected.to contain_concat('/etc/keepalived/keepalived.conf').without_validate_cmd }
+      end
     end
   end
 end