Merge pull request #43 from crayfishx/add_environment_options

Add environment options

Author: stephenrjohnson

README.markdown

@@ -27,7 +27,14 @@ running through webrick. In which case run a single puppet run using
         storeconfigs              => true,
     }
 
-### Master environments ###
+## Puppet Environments ##
+
+Puppet 3.5 introduced a new way of handling Puppet environments known as _Directory Environments_.  This is expected to become the default configuration as of Puppet 4.0, this module supports both methods.
+
+### Config Method (default) ###
+
+    class { 'puppet::master': }
+
     puppet::masterenv {'dev':
         modulepath => '/etc/puppet/evn/dev/modules',
         manifest   => '/etc/puppet/env/dev/site.pp',
@@ -37,6 +44,15 @@ running through webrick. In which case run a single puppet run using
         manifest   => '/etc/puppet/env/production/site.pp',
     }
 
+### Directory method using _environmentpath_ ###
+
+    class { 'puppet::master':
+      environments => 'directory',
+    }
+
+Optionally, an `environmentpath` parameter can be supplied to configure the base root of Puppet environments, this defaults to `$confdir/environments`
+
+
 ## Agent ##
     class { 'puppet::agent':
         puppet_server             => master.puppetlabs.vm,

manifests/master.pp

@@ -8,6 +8,8 @@
 #  ['modulepath']               - Module path to be served by the puppet master
 #  ['manifest']                 - Manifest path
 #  ['hiera_config']             - Hiera config file path
+#  ['environments']             - Which environment method (directory or config)
+#  ['environmentpath']          - Puppet environment base path (use with environments directory)
 #  ['reports']                  - Turn on puppet reports
 #  ['storeconfigs']             - Use storedcofnigs
 #  ['storeconfigs_dbserver']    - Puppetdb server
@@ -53,6 +55,8 @@
   $modulepath                 = $::puppet::params::modulepath,
   $manifest                   = $::puppet::params::manifest,
   $hiera_config               = $::puppet::params::hiera_config,
+  $environmentpath            = $::puppet::params::environmentpath,
+  $environments               = $::puppet::params::environments,
   $reports                    = store,
   $storeconfigs               = false,
   $storeconfigs_dbserver      = $::puppet::params::storeconfigs_dbserver,
@@ -191,17 +195,33 @@
       section => 'master',
   }
 
+  case $environments {
+    'config': {
+      $setting_config='present'
+      $setting_directory='absent'
+    }
+    'directory': {
+      $setting_config='absent'
+      $setting_directory='present'
+    }
+    default: { fail("Unknown value for environments ${environments}") }
+  }
+
   ini_setting {'puppetmastermodulepath':
-    ensure  => present,
+    ensure  => $setting_config,
     setting => 'modulepath',
     value   => $modulepath,
   }
-
   ini_setting {'puppetmastermanifest':
-    ensure  => present,
+    ensure  => $setting_config,
     setting => 'manifest',
     value   => $manifest,
   }
+  ini_setting {'puppetmasterenvironmentpath':
+    ensure  => $setting_directory,
+    setting => 'environmentpath',
+    value   => $environmentpath,
+  }
 
   ini_setting {'puppetmasterhieraconfig':
     ensure  => present,

manifests/params.pp

@@ -29,6 +29,10 @@
   $apache_serveradmin               = 'root'
   $parser                           = 'current'
   $puppetdb_strict_validation       = true
+  $environments                     = 'config'
+
+  # Only used when environments == directory
+  $environmentpath                  = '$confdir/environments'
 
   case $::osfamily {
     'RedHat': {

spec/classes/puppet_master_spec.rb

@@ -74,6 +74,10 @@
             should contain_class('puppet::passenger').with(
               :before => 'Anchor[puppet::master::end]'
             )
+            should contain_ini_setting('puppetmasterenvironmentpath').with(
+                :ensure  => 'absent',
+                :setting => 'environmentpath'
+            )
             should contain_ini_setting('puppetmastermodulepath').with(
                 :ensure  => 'present',
                 :section => 'master',
@@ -214,6 +218,9 @@
             should contain_class('puppet::passenger').with(
               :before => 'Anchor[puppet::master::end]'
             )
+            should contain_ini_setting('puppetmasterenvironmentpath').with(
+                :ensure  => 'absent'
+            )
             should contain_ini_setting('puppetmastermodulepath').with(
                 :ensure  => 'present',
                 :section => 'master',
@@ -282,4 +289,71 @@
             should contain_anchor('puppet::master::end')
         }
     end
+    context 'When environment handling is set to directory' do
+        let(:facts) do
+            {
+                :osfamily        => 'RedHat',
+                :operatingsystem => 'RedHat',
+                :operatingsystemrelease => '6',
+                :concat_basedir => '/nde',
+            }
+        end
+        let (:params) do {
+            :environments => 'directory'
+        }
+        end
+
+        it {
+            should contain_ini_setting('puppetmasterenvironmentpath').with(
+                :ensure  => 'present',
+                :section => 'master',
+                :setting => 'environmentpath',
+                :path    => '/etc/puppet/puppet.conf',
+                :value   => '$confdir/environments'
+            )
+            should contain_ini_setting('puppetmastermodulepath').with(
+                :ensure  => 'absent',
+                :setting => 'modulepath'
+            )
+            should contain_ini_setting('puppetmastermanifest').with(
+                :ensure  => 'absent',
+                :setting => 'manifest'
+            )
+            
+        }
+    end
+    context 'When environment handling is set to directory with specified environmentpath' do
+        let(:facts) do
+            {
+                :osfamily        => 'RedHat',
+                :operatingsystem => 'RedHat',
+                :operatingsystemrelease => '6',
+                :concat_basedir => '/nde',
+            }
+        end
+        let (:params) do {
+            :environments => 'directory',
+            :environmentpath => '/etc/puppetlabs/puppet/environments',
+        }
+        end
+
+        it {
+            should contain_ini_setting('puppetmasterenvironmentpath').with(
+                :ensure  => 'present',
+                :section => 'master',
+                :setting => 'environmentpath',
+                :path    => '/etc/puppet/puppet.conf',
+                :value   => '/etc/puppetlabs/puppet/environments'
+            )
+            should contain_ini_setting('puppetmastermodulepath').with(
+                :ensure  => 'absent',
+                :setting => 'modulepath'
+            )
+            should contain_ini_setting('puppetmastermanifest').with(
+                :ensure  => 'absent',
+                :setting => 'manifest'
+            )
+        }
+    end
+        
 end