Merge pull request #66 from razorsedge/puppetmasterenvironmentpath

Puppetmasterenvironmentpath

Author: stephenrjohnson

manifests/params.pp

@@ -33,7 +33,7 @@
   $digest_algorithm                 = 'md5'
 
   # Only used when environments == directory
-  $environmentpath                  = "${confdir}/environments"
+  $environmentpath                  = '$confdir/environments'
 
   case $::osfamily {
     'RedHat': {

spec/classes/puppet_master_spec.rb

@@ -202,7 +202,7 @@
                 :gid    => nil
             )
             should contain_package(params[:puppet_master_package]).with(
-                :ensure => params[:version],
+                :ensure => params[:version]
             )
             should_not contain_package('puppetmaster-common').with(
                 :ensure => params[:version]
@@ -345,7 +345,7 @@
                 :section => 'master',
                 :setting => 'environmentpath',
                 :path    => '/etc/puppet/puppet.conf',
-                :value   => '/etc/puppet/environments'
+                :value   => '$confdir/environments'
             )
             should contain_ini_setting('puppetmastermodulepath').with(
                 :ensure  => 'absent',