Only add strict_variables setting if set to something other than undef

Author: robinbowes

manifests/master.pp

@@ -87,7 +87,7 @@
   $dns_alt_names              = ['puppet'],
   $digest_algorithm           = $::puppet::params::digest_algorithm,
   $generate_ssl_certs         = true,
-  $strict_variables           = false,
+  $strict_variables           = undef,
 ) inherits puppet::params {
 
   anchor { 'puppet::master::begin': }
@@ -124,8 +124,6 @@
     }
   }
 
-  validate_bool($strict_variables)
-
   Anchor['puppet::master::begin'] ->
   class {'puppet::passenger':
     puppet_passenger_port    => $puppet_passenger_port,
@@ -316,10 +314,13 @@
       value   => $digest_algorithm,
   }
 
-  ini_setting {'puppetmasterstrictvariables':
-      ensure  => present,
-      setting => 'strict_variables',
-      value   => $strict_variables,
+  if $strict_variables != undef {
+    validate_bool($strict_variables)
+    ini_setting {'puppetmasterstrictvariables':
+        ensure  => present,
+        setting => 'strict_variables',
+        value   => $strict_variables,
+    }
   }
 
   anchor { 'puppet::master::end': }