Merge pull request #126 from mcanevet/fix/strict_variables

Add strict_variables support when puppetdb is not on puppetmaster

Author: kbarber

.travis.yml

@@ -14,6 +14,7 @@ env:
   - PUPPET_GEM_VERSION="~> 2.7"
   - PUPPET_GEM_VERSION="~> 3.3"
   - PUPPET_GEM_VERSION="> 3.3"
+  - PUPPET_GEM_VERSION="~> 3.5.0.rc3" STRICT_VARIABLES="yes"
   global:
   - PUBLISHER_LOGIN=puppetlabs
   -  secure: "FInoEwh3G4Auqp+OOdIc20lDLqrV6FHzWsM8ercHWjhDRD23VI49B1qqehWjaI8lKM3D5mTvdup23IVQBJo8M0rR/yfju1NhMYFTQ5bcJIrbQ3fn4n/zSaE8gLTOtHwzjSlqTJAYjxOAnp1VdMZngqpU/RYfSk68zJD34NqfovA="

manifests/master/config.pp

@@ -1,7 +1,10 @@
 # Manage puppet configuration. See README.md for more details.
 class puppetdb::master::config(
   $puppetdb_server             = $::fqdn,
-  $puppetdb_port               = $puppetdb::disable_ssl ? { true => 8080, default => 8081, },
+  $puppetdb_port               = defined('$puppetdb::disable_ssl') ? {
+    true    => $puppetdb::disable_ssl ? { true => 8080, default => 8081, },
+    default => 8081,
+  },
   $puppetdb_soft_write_failure = false,
   $manage_routes               = true,
   $manage_storeconfigs         = true,

manifests/params.pp

@@ -50,7 +50,7 @@
     }
   }
 
-  if $::is_pe == 'true' {
+  if defined('$::is_pe') and $::is_pe == 'true' {
     $puppetdb_package     = 'pe-puppetdb'
     $puppetdb_service     = 'pe-puppetdb'
     $confdir              = '/etc/puppetlabs/puppetdb/conf.d'

spec/spec_helper.rb

@@ -13,6 +13,10 @@
     # Store any environment variables away to be restored later
     @old_env = {}
     ENV.each_key {|k| @old_env[k] = ENV[k]}
+
+    if ENV['STRICT_VARIABLES'] == 'yes'
+      Puppet.settings[:strict_variables]=true
+    end
   end
 
   c.after :each do

spec/unit/classes/init_spec.rb

@@ -11,6 +11,8 @@
         :operatingsystemrelease => '6.0',
         :kernel => 'Linux',
         :concat_basedir => '/var/lib/puppet/concat',
+        :id => 'root',
+        :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
       }
     end
 

spec/unit/classes/master/config_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe 'puppetdb::master::config', :type => :class do
+
+  let(:facts) do
+    {
+      :osfamily => 'Debian',
+      :operatingsystem => 'Debian',
+      :operatingsystemrelease => '6.0',
+      :kernel => 'Linux',
+      :concat_basedir => '/var/lib/puppet/concat',
+    }
+  end
+
+  context 'when using default values' do
+    it { should compile.with_all_deps }
+  end
+
+end