Merge branch 'add_strict_variables' of https://github.com/yo61/puppetmodule into yo61-add_strict_variables

Author: Stephen

manifests/master.pp

@@ -33,6 +33,7 @@
 #  ['dns_alt_names']            - Comma separated list of alternative DNS names
 #  ['digest_algorithm']         - The algorithm to use for file digests.
 #  ['generate_ssl_certs']       - Generate ssl certs (false to disable)
+#  ['strict_variables']         - Makes the parser raise errors when referencing unknown variables
 #
 # Requires:
 #
@@ -86,6 +87,7 @@
   $dns_alt_names              = ['puppet'],
   $digest_algorithm           = $::puppet::params::digest_algorithm,
   $generate_ssl_certs         = true,
+  $strict_variables           = undef,
 ) inherits puppet::params {
 
   anchor { 'puppet::master::begin': }
@@ -312,5 +314,14 @@
       value   => $digest_algorithm,
   }
 
+  if $strict_variables != undef {
+    validate_bool(str2bool($strict_variables))
+    ini_setting {'puppetmasterstrictvariables':
+        ensure  => present,
+        setting => 'strict_variables',
+        value   => $strict_variables,
+    }
+  }
+
   anchor { 'puppet::master::end': }
 }

spec/classes/puppet_master_spec.rb

@@ -24,7 +24,8 @@
                 :certname               => 'test.example.com',
                 :storeconfigs           => 'true',
                 :storeconfigs_dbserver  => 'test.example.com',
-                :dns_alt_names          => ['puppet']
+                :dns_alt_names          => ['puppet'],
+                :strict_variables       => 'true'
 
             }
         end
@@ -156,6 +157,13 @@
                 :path    => '/etc/puppet/puppet.conf',
                 :value   => params[:dns_alt_names].join(',')
             )
+            should contain_ini_setting('puppetmasterstrictvariables').with(
+                :ensure  => 'present',
+                :section => 'master',
+                :setting => 'strict_variables',
+                :path    => '/etc/puppet/puppet.conf',
+                :value   => params[:strict_variables]
+            )
             should contain_anchor('puppet::master::begin').with_before(
               ['Class[Puppet::Passenger]', 'Class[Puppet::Storeconfigs]']
             )
@@ -185,7 +193,8 @@
                 :certname               => 'test.example.com',
                 :storeconfigs           => 'true',
                 :storeconfigs_dbserver  => 'test.example.com',
-                :dns_alt_names          => ['puppet']
+                :dns_alt_names          => ['puppet'],
+                :strict_variables       => 'true'
 
             }
         end
@@ -315,6 +324,13 @@
                 :path    => '/etc/puppet/puppet.conf',
                 :value   => params[:dns_alt_names].join(',')
             )
+            should contain_ini_setting('puppetmasterstrictvariables').with(
+                :ensure  => 'present',
+                :section => 'master',
+                :setting => 'strict_variables',
+                :path    => '/etc/puppet/puppet.conf',
+                :value   => params[:strict_variables]
+            )
             should contain_anchor('puppet::master::begin').with_before(
               ['Class[Puppet::Passenger]', 'Class[Puppet::Storeconfigs]']
             )