Merge pull request #48 from crayfishx/dir_envs

Dir envs thanks

Author: stephenrjohnson

manifests/masterenv.pp

@@ -18,23 +18,44 @@
 #       manifest               => 'dev'
 #   }
 #
-define  puppet::masterenv ($modulepath, $manifest, $puppet_conf = $::puppet::params::puppet_conf){
+define  puppet::masterenv (
+  $modulepath,
+  $manifest,
+  $puppet_conf = $::puppet::params::puppet_conf,
+  $environments = $::puppet::master::environments,
+  $environmentpath = $::puppet::master::environmentpath
+) {
+
+  case $environments {
+    'directory': {
+      $path = "${environmentpath}/${name}/environment.conf"
+      $section = ''
+      file { "${environmentpath}/${name}":
+        ensure => directory,
+      }
+    }
+    default: {
+      $path = $puppet_conf
+      $section = $name
+    }
+  }
+
   Ini_setting {
-      path    => $puppet_conf,
+      path    => $path,
+      section => $section,
       require => [File[$puppet_conf], Class['puppet::master']],
       notify  => Service['httpd'],
   }
 
-  ini_setting {"masterenvmodule${name}":
-    ensure  => present,
-    section => $name,
-    setting => 'modulepath',
-    value   => $modulepath,
-  }
-  ini_setting {"masterenvmanifest${name}":
-    ensure  => present,
-    section => $name,
-    setting => 'manifest',
-    value   => $manifest,
+  ini_setting {
+    "masterenvmodule${name}":
+      ensure  => present,
+      setting => 'modulepath',
+      value   => $modulepath;
+
+    "masterenvmanifest${name}":
+      ensure  => present,
+      setting => 'manifest',
+      value   => $manifest;
   }
 }

spec/defines/puppet_masterenv_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe 'puppet::masterenv', :type => :define do
-  context "Create environment" do
+  context "Create config environment" do
     let :title do
       'dev'
     end
@@ -30,4 +30,38 @@
       )
     }
   end
+  context "Create directory environment" do
+    let :title do
+      'dev'
+    end
+
+    let :params do
+      {
+        :manifest        => '/etc/puppet/environments/dev.pp',
+        :modulepath      => '/etc/puppet/environments/modules/',
+        :puppet_conf     => '/etc/puppet/puppet.conf',
+        :environments    => 'directory',
+        :environmentpath => '/etc/puppet/environments'
+      }
+    end
+    it {
+      should contain_ini_setting("masterenvmodule#{title}").with(
+        :ensure  => 'present',
+        :section => '',
+        :setting => 'modulepath',
+        :path    => '/etc/puppet/environments/dev/environment.conf',
+        :value   => params[:modulepath]
+      )
+      should contain_ini_setting("masterenvmanifest#{title}").with(
+        :ensure  => 'present',
+        :section => '',
+        :setting => 'manifest',
+        :path    => '/etc/puppet/environments/dev/environment.conf',
+        :value   => params[:manifest]
+      )
+     should contain_file("/etc/puppet/environments/dev").with(
+       :ensure   => 'directory'
+     )
+    }
+  end
 end