puppet 3.6.2 → 3.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 952f14811133b7d7bdfb1e2ea843e3da8f38a12c
-  data.tar.gz: b7e2b14ef818a11ec622252f9ca1b6ba75b12daf
+  metadata.gz: b1769f6b10ab3d702d66c2d30c9c4f660585e669
+  data.tar.gz: 234327c4b251e5a7e910d88f47485478368a9869
 SHA512:
-  metadata.gz: 5dda05fc1e431d416eb81a9580e7ca9fd841b29c60caffb442c8846c7dc0e8e45d90a54bd692a82fd98a071af0d5c7be58e634a37dbb5b7bbb1977709b6c0f38
-  data.tar.gz: 1f6a6d2e3485201365b92850cf9567d4bebc6b5f6037ccfc42a694400a25dd61260bda654290ae899165f6b5436ac943674ed0ea9b048a8f9f99ee578701eb2e
+  metadata.gz: b3b94c17d5ca7b0891ceb0ca86f10f2b22d98d2ae4cb63f37871d83fecc2ad628f5320e18da5e6b94162a878ffb3273e546b8894c550f8a02bcccd9d43d2fcdf
+  data.tar.gz: 6709da92aed758a08eca93304ba1b709969ba49fe081578469517f91d13e8539467cfa05a265f5a44e3b6355696b16646aeece38b80f9feb1836813b12f7c10d

data/CONTRIBUTING.md

@@ -22,9 +22,8 @@ top of things.
   * This is usually the master branch.
   * Only target release branches if you are certain your fix must be on that
     branch.
-  * To quickly create a topic branch based on master; `git branch
-    fix/master/my_contribution master` then checkout the new branch with `git
-    checkout fix/master/my_contribution`.  Please avoid working directly on the
+  * To quickly create a topic branch based on master; `git checkout -b
+    fix/master/my_contribution master`. Please avoid working directly on the
     `master` branch.
 * Make commits of logical units.
 * Check for unnecessary whitespace with `git diff --check` before committing.

data/Gemfile

@@ -27,13 +27,9 @@ gem "puppet", :path => File.dirname(__FILE__), :require => false
 gem "facter", *location_for(ENV['FACTER_LOCATION'] || ['> 1.6', '< 3'])
 gem "hiera", *location_for(ENV['HIERA_LOCATION'] || '~> 1.0')
 gem "rake", "10.1.1", :require => false
-gem "rgen", "0.6.5", :require => false
 
 group(:development, :test) do
-
-  # Jenkins workers may be using RSpec 2.9, so RSpec 2.11 syntax
-  # (like `expect(value).to eq matcher`) should be avoided.
-  gem "rspec", "~> 2.11.0", :require => false
+  gem "rspec", "~> 2.14.0", :require => false
 
   # Mocha is not compatible across minor version changes; because of this only
   # versions matching ~> 0.10.5 are supported. All other versions are unsupported
@@ -49,11 +45,13 @@ group(:development, :test) do
 end
 
 group(:development) do
-  case RUBY_VERSION
-  when /^1.8/
-    gem 'ruby-prof', "~> 0.13.1", :require => false
-  else
-    gem 'ruby-prof', :require => false
+  if RUBY_PLATFORM != 'java'
+    case RUBY_VERSION
+    when /^1.8/
+      gem 'ruby-prof', "~> 0.13.1", :require => false
+    else
+      gem 'ruby-prof', :require => false
+    end
   end
 end
 
@@ -63,6 +61,9 @@ group(:extra) do
   gem "couchrest", '~> 1.0', :require => false
   gem "net-ssh", '~> 2.1', :require => false
   gem "puppetlabs_spec_helper", :require => false
+  # rest-client is used only by couchrest, so when
+  # that dependency goes away, this one can also
+  gem "rest-client", '1.6.7', :require => false
   gem "stomp", :require => false
   gem "tzinfo", :require => false
   case RUBY_PLATFORM
@@ -78,7 +79,10 @@ end
 require 'yaml'
 data = YAML.load_file(File.join(File.dirname(__FILE__), 'ext', 'project_data.yaml'))
 bundle_platforms = data['bundle_platforms']
+x64_platform = Gem::Platform.local.cpu == 'x64'
 data['gem_platform_dependencies'].each_pair do |gem_platform, info|
+  next if gem_platform == 'x86-mingw32' && x64_platform
+  next if gem_platform == 'x64-mingw32' && !x64_platform
   if bundle_deps = info['gem_runtime_dependencies']
     bundle_platform = bundle_platforms[gem_platform] or raise "Missing bundle_platform"
     platform(bundle_platform.intern) do

data/README.md

@@ -2,7 +2,7 @@ Puppet
 ======
 
 [![Build Status](https://travis-ci.org/puppetlabs/puppet.png?branch=master)](https://travis-ci.org/puppetlabs/puppet)
-[![Inline docs](http://inch-pages.github.io/github/puppetlabs/puppet.png)](http://inch-pages.github.io/github/puppetlabs/puppet)
+[![Inline docs](http://inch-ci.org/github/puppetlabs/puppet.png)](http://inch-ci.org/github/puppetlabs/puppet)
 
 Puppet, an automated administrative engine for your Linux, Unix, and Windows systems, performs
 administrative tasks (such as adding users, installing packages, and updating server

data/ext/build_defaults.yaml

@@ -2,7 +2,7 @@
 packaging_url: 'git://github.com/puppetlabs/packaging.git --branch=master'
 packaging_repo: 'packaging'
 default_cow: 'base-squeeze-i386.cow'
-cows: 'base-lucid-i386.cow base-precise-i386.cow base-quantal-i386.cow base-squeeze-i386.cow base-stable-i386.cow base-testing-i386.cow base-trusty-i386.cow base-wheezy-i386.cow base-saucy-i386.cow'
+cows: 'base-lucid-i386.cow base-precise-i386.cow base-squeeze-i386.cow base-stable-i386.cow base-testing-i386.cow base-trusty-i386.cow base-wheezy-i386.cow'
 pbuild_conf: '/etc/pbuilderrc'
 packager: 'puppetlabs'
 gpg_name: 'info@puppetlabs.com'
@@ -14,6 +14,21 @@ yum_host: 'yum.puppetlabs.com'
 yum_repo_path: '/opt/repository/yum/'
 build_gem: TRUE
 build_dmg: TRUE
+build_msi:
+  puppet_for_the_win:
+    ref: 'c61dda253b09bd855488f7b6dd7332fdf84d3039'
+    repo: 'git://github.com/puppetlabs/puppet_for_the_win.git'
+  facter:
+    ref: 'refs/tags/2.2.0'
+    repo: 'git://github.com/puppetlabs/facter.git'
+  hiera:
+    ref: 'refs/tags/1.3.4'
+    repo: 'git://github.com/puppetlabs/hiera.git'
+  sys:
+    ref:
+      x86: '890ad47c3b70de4e4956d2699b54d481d5a1b72e'
+      x64: '2820779a3f4281534a6792b0ab20b2cf213647dc'
+    repo: 'git://github.com/puppetlabs/puppet-win32-ruby.git'
 apt_host: 'apt.puppetlabs.com'
 apt_repo_url: 'http://apt.puppetlabs.com'
 apt_repo_path: '/opt/repository/incoming'

data/ext/debian/control

@@ -11,12 +11,12 @@ Homepage: http://projects.puppetlabs.com/projects/puppet
 
 Package: puppet-common
 Architecture: all
-Depends: ${misc:Depends}, ruby | ruby-interpreter, libopenssl-ruby | libopenssl-ruby1.9.1 | libruby (>= 1:1.9.3.4), ruby-shadow | libshadow-ruby1.8, libaugeas-ruby | libaugeas-ruby1.9.1 | libaugeas-ruby1.8, adduser, lsb-base, sysv-rc (>= 2.86) | file-rc, hiera (>= 1.0.0), facter (>= 1.7.0), ruby-rgen (>= 0.6.5), libjson-ruby | ruby-json
+Depends: ${misc:Depends}, ruby | ruby-interpreter, libopenssl-ruby | libopenssl-ruby1.9.1 | libruby (>= 1:1.9.3.4), ruby-shadow | libshadow-ruby1.8, libaugeas-ruby | libaugeas-ruby1.9.1 | libaugeas-ruby1.8, adduser, lsb-base, sysv-rc (>= 2.86) | file-rc, hiera (>= 1.0.0), facter (>= 1.7.0), libjson-ruby | ruby-json
 Recommends: lsb-release, debconf-utils
 Suggests: ruby-selinux | libselinux-ruby1.8, librrd-ruby1.9.1 | librrd-ruby1.8
 Breaks: puppet (<< 2.6.0~rc2-1), puppetmaster (<< 0.25.4-1)
 Provides: hiera-puppet
-Conflicts: hiera-puppet
+Conflicts: hiera-puppet, puppet (<< 3.3.0-1puppetlabs1)
 Replaces: hiera-puppet
 Description: Centralized configuration management
  Puppet lets you centrally manage every important aspect of your system
@@ -39,6 +39,7 @@ Architecture: all
 Depends: ${misc:Depends},  puppet-common (= ${binary:Version}), ruby | ruby-interpreter
 Recommends: rdoc
 Suggests: puppet-el, vim-puppet
+Conflicts: puppet-common (<< 3.3.0-1puppetlabs1)
 Description: Centralized configuration management - agent startup and compatibility scripts
  This package contains the startup script and compatbility scripts for the
  puppet agent, which is the process responsible for configuring the local node.

data/ext/debian/puppet-common.dirs

@@ -10,3 +10,4 @@ usr/lib/ruby/vendor_ruby
 usr/share/puppet/ext
 var/lib/puppet
 var/log/puppet
+var/run/puppet

data/ext/debian/puppet-common.postinst

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 set -e
 
@@ -13,18 +13,18 @@ if [ "$1" = "configure" ]; then
 	fi
 
 	# Set correct permissions and ownership for puppet directories
-	if ! dpkg-statoverride --list /var/log/puppet >/dev/null 2>&1; then
-		dpkg-statoverride --update --add puppet puppet 0750 /var/log/puppet
-	fi
-
-	if ! dpkg-statoverride --list /var/lib/puppet >/dev/null 2>&1; then
-		dpkg-statoverride --update --add puppet puppet 0750 /var/lib/puppet
-	fi
+	for dir in /var/{run,lib,log}/puppet; do
+		if ! dpkg-statoverride --list "$dir" >/dev/null 2>&1; then
+			dpkg-statoverride --update --add puppet puppet 0750 "$dir"
+		fi
+	done
 
 	# Create folders common to "puppet" and "puppetmaster", which need
 	# to be owned by the "puppet" user
 	install --owner puppet --group puppet --directory \
 		/var/lib/puppet/state
+	install --owner puppet --group puppet --directory \
+		/var/lib/puppet/reports
 	
 	# Handle 
 	if [ -d /etc/puppet/ssl ] && [ ! -e /var/lib/puppet/ssl ] && grep -q 'ssldir=/var/lib/puppet/ssl' /etc/puppet/puppet.conf; then

data/ext/debian/puppet-common.postrm

@@ -6,9 +6,10 @@ case "$1" in
 		rm -f /etc/puppet/puppetd.conf
 
 		# Remove puppet state directory created by the postinst script.
-		# This directory can be removed without causing harm 
+		# This directory can be removed without causing harm
 		# according to upstream documentation.
 		rm -rf /var/lib/puppet/state
+		rm -rf /var/lib/puppet/reports
 		if [ -d /var/lib/puppet ]; then
 			rmdir --ignore-fail-on-non-empty /var/lib/puppet
 		fi

data/ext/project_data.yaml

@@ -17,7 +17,6 @@ gem_forge_project: 'puppet'
 gem_runtime_dependencies:
   facter: ['> 1.6', '< 3']
   hiera: '~> 1.0'
-  rgen: '~> 0.6.5'
   json_pure:
 gem_rdoc_options:
   - --title
@@ -29,18 +28,23 @@ gem_platform_dependencies:
   x86-mingw32:
     gem_runtime_dependencies:
       # Pinning versions that require native extensions
-      ffi: '1.9.0'
-      sys-admin: '1.5.6'
-      win32-api: '1.4.8'
-      win32-dir: '~> 0.4.3'
-      win32-eventlog: '~> 0.5.3'
-      win32-process: '~> 0.6.5'
-      win32-security: '~> 0.1.4'
-      win32-service: '0.7.2'
-      win32-taskscheduler: '~> 0.2.2'
+      ffi: '1.9.3'
+      win32-dir: '~> 0.4.9'
+      win32-eventlog: '~> 0.6.1'
+      win32-process: '~> 0.7.4'
+      win32-security: '~> 0.2.5'
+      win32-service: '~> 0.8.4'
       win32console:  '1.3.2'
-      windows-api: '~> 0.4.2'
-      windows-pr: '~> 1.2.2'
+      minitar: '~> 0.5.4'
+  x64-mingw32:
+    gem_runtime_dependencies:
+      ffi: '1.9.3'
+      win32-dir: '~> 0.4.9'
+      win32-eventlog: '~> 0.6.1'
+      win32-process: '~> 0.7.4'
+      win32-security: '~> 0.2.5'
+      win32-service: '~> 0.8.4'
       minitar: '~> 0.5.4'
 bundle_platforms:
   x86-mingw32: mingw
+  x64-mingw32: x64_mingw

data/ext/rack/example-passenger-vhost.conf

@@ -18,8 +18,8 @@ Listen 8140
 
 <VirtualHost *:8140>
         SSLEngine on
-        SSLProtocol             ALL -SSLv2
-        SSLCipherSuite          ALL:!aNULL:!eNULL:!DES:!3DES:!IDEA:!SEED:!DSS:!PSK:!RC4:!MD5:+HIGH:+MEDIUM:!LOW:!SSLv2:!EXP
+        SSLProtocol             ALL -SSLv2 -SSLv3
+        SSLCipherSuite          EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!IDEA:!ECDSA:kEDH:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA
         SSLHonorCipherOrder     on
 
         SSLCertificateFile      /etc/puppet/ssl/certs/squigley.namespace.at.pem

data/ext/redhat/puppet.spec.erb

@@ -3,7 +3,7 @@
 
 # Fedora 17 ships with ruby 1.9, RHEL 7 with ruby 2.0, which use vendorlibdir instead
 # of sitelibdir. Adjust our target if installing on f17 or rhel7.
-%if 0%{?fedora} >= 17 || 0%{?rhel} >= 7
+%if 0%{?fedora} >= 17 || 0%{?rhel} >= 7 || 0%{?amzn} >= 1
 %global puppet_libdir   %(ruby -rrbconfig -e 'puts RbConfig::CONFIG["vendorlibdir"]')
 %else
 %global puppet_libdir   %(ruby -rrbconfig -e 'puts RbConfig::CONFIG["sitelibdir"]')
@@ -49,7 +49,7 @@ Requires:       rubygem-json
 %if 0%{?fedora} || 0%{?rhel} >= 6
 %{!?_without_selinux:Requires: ruby(selinux), libselinux-utils}
 %else
-%if 0%{?rhel} && 0%{?rhel} == 5
+%if ( 0%{?rhel} && 0%{?rhel} == 5 ) || 0%{?amzn} >= 1
 %{!?_without_selinux:Requires: libselinux-ruby, libselinux-utils}
 %endif
 %endif
@@ -59,7 +59,6 @@ Requires:       facter >= 1:1.7.0
 # Ruby 1.8.7 available for el5 at: yum.puppetlabs.com/el/5/devel/$ARCH
 Requires:       ruby >= 1.8.7
 Requires:       hiera >= 1.0.0
-Requires:       ruby-rgen >= 0.6.5
 Obsoletes:      hiera-puppet < 1.0.0
 Provides:       hiera-puppet >= 1.0.0
 %{!?_without_augeas:Requires: ruby-augeas}
@@ -120,6 +119,8 @@ install -d -m0755 %{buildroot}%{_sysconfdir}/puppet/environments/example_env/mod
 install -d -m0755 %{buildroot}%{_sysconfdir}/puppet/manifests
 install -d -m0755 %{buildroot}%{_datadir}/%{name}/modules
 install -d -m0755 %{buildroot}%{_localstatedir}/lib/puppet
+install -d -m0755 %{buildroot}%{_localstatedir}/lib/puppet/state
+install -d -m0755 %{buildroot}%{_localstatedir}/lib/puppet/reports
 install -d -m0755 %{buildroot}%{_localstatedir}/run/puppet
 
 # As per redhat bz #495096
@@ -260,6 +261,8 @@ cp -pr ext/puppet-nm-dispatcher \
 %defattr(-, puppet, puppet, 0750)
 %{_localstatedir}/log/puppet
 %{_localstatedir}/lib/puppet
+%{_localstatedir}/lib/puppet/state
+%{_localstatedir}/lib/puppet/reports
 # Return the default attributes to 0755 to
 # prevent incorrect permission assignment on EL6
 %defattr(-, root, root, 0755)

data/ext/windows/service/daemon.rb

@@ -6,14 +6,13 @@ require 'win32/dir'
 require 'win32/process'
 require 'win32/eventlog'
 
-require 'windows/synchronize'
-require 'windows/handle'
-
 class WindowsDaemon < Win32::Daemon
-  include Windows::Synchronize
-  include Windows::Handle
-  include Windows::Process
+  CREATE_NEW_CONSOLE          = 0x00000010
+  EVENTLOG_ERROR_TYPE         = 0x0001
+  EVENTLOG_WARNING_TYPE       = 0x0002
+  EVENTLOG_INFORMATION_TYPE   = 0x0004
 
+  @run_thread = nil
   @LOG_TO_FILE = false
   LOG_FILE =  File.expand_path(File.join(Dir::COMMON_APPDATA, 'PuppetLabs', 'puppet', 'var', 'log', 'windows.log'))
   LEVELS = [:debug, :info, :notice, :err]
@@ -63,46 +62,42 @@ class WindowsDaemon < Win32::Daemon
 
     log_notice('Service started')
 
-    while running? do
+    service = self
+    @run_thread = Thread.new do
       begin
-        runinterval = %x{ "#{puppet}" agent --configprint runinterval }.to_i
-        if runinterval == 0
-          runinterval = 1800
-          log_err("Failed to determine runinterval, defaulting to #{runinterval} seconds")
+        while service.running? do
+          runinterval = service.parse_runinterval(puppet)
+          if service.state == RUNNING or service.state == IDLE
+            service.log_notice("Executing agent with arguments: #{args}")
+            pid = Process.create(:command_line => "\"#{puppet}\" agent --onetime #{args}", :creation_flags => CREATE_NEW_CONSOLE).process_id
+            service.log_debug("Process created: #{pid}")
+          else
+            service.log_debug("Service is paused.  Not invoking Puppet agent")
+          end
+
+          service.log_debug("Service worker thread waiting for #{runinterval} seconds")
+          sleep(runinterval)
+          service.log_debug('Service worker thread woken up')
         end
       rescue Exception => e
-        log_exception(e)
-        runinterval = 1800
-      end
-
-      if state == RUNNING or state == IDLE
-        log_notice("Executing agent with arguments: #{args}")
-        pid = Process.create(:command_line => "\"#{puppet}\" agent --onetime #{args}", :creation_flags => Process::CREATE_NEW_CONSOLE).process_id
-        log_debug("Process created: #{pid}")
-      else
-        log_debug("Service is paused.  Not invoking Puppet agent")
+        service.log_exception(e)
       end
-
-      log_debug("Service waiting for #{runinterval} seconds")
-      sleep(runinterval)
-      log_debug('Service woken up')
     end
+    @run_thread.join
 
-    log_notice('Service stopped')
   rescue Exception => e
     log_exception(e)
+  ensure
+    log_notice('Service stopped')
   end
 
   def service_stop
-    log_notice('Service stopping')
-    Thread.main.wakeup
+    log_notice('Service stopping / killing worker thread')
+    @run_thread.kill if @run_thread
   end
 
   def service_pause
-    # The service will not stay in a paused stated, instead it will go back into a running state after a short period of time.  This is an issue in the Win32-Service ruby code
-    # Raised bug https://github.com/djberg96/win32-service/issues/11 and is fixed in version 0.8.3.
-    # Because the Pause feature is so rarely used, there is no point in creating a workaround until puppet uses 0.8.3.
-    log_notice('Service pausing. The service will not stay paused. See Puppet Issue PUP-1471 for more information')
+    log_notice('Service pausing')
   end
 
   def service_resume
@@ -130,16 +125,12 @@ class WindowsDaemon < Win32::Daemon
       end
 
       case level
-        when :debug
-          report_windows_event(Win32::EventLog::INFO,0x01,msg.to_s)
-        when :info
-          report_windows_event(Win32::EventLog::INFO,0x01,msg.to_s)
-        when :notice
-          report_windows_event(Win32::EventLog::INFO,0x01,msg.to_s)
+        when :debug, :info, :notice
+          report_windows_event(EVENTLOG_INFORMATION_TYPE,0x01,msg.to_s)
         when :err
-          report_windows_event(Win32::EventLog::ERR,0x03,msg.to_s)
+          report_windows_event(EVENTLOG_ERROR_TYPE,0x03,msg.to_s)
         else
-          report_windows_event(Win32::EventLog::WARN,0x02,msg.to_s)
+          report_windows_event(EVENTLOG_WARNING_TYPE,0x02,msg.to_s)
       end
     end
   end
@@ -150,7 +141,7 @@ class WindowsDaemon < Win32::Daemon
       eventlog = Win32::EventLog.open("Application")
       eventlog.report_event(
         :source      => "Puppet",
-        :event_type  => type,   # Win32::EventLog::INFO or WARN, ERROR
+        :event_type  => type,   # EVENTLOG_ERROR_TYPE, etc
         :event_id    => id,     # 0x01 or 0x02, 0x03 etc.
         :data        => message # "the message"
       )
@@ -162,6 +153,21 @@ class WindowsDaemon < Win32::Daemon
       end
     end
   end
+
+  def parse_runinterval(puppet_path)
+    begin
+      runinterval = %x{ "#{puppet_path}" agent --configprint runinterval }.to_i
+      if runinterval == 0
+        runinterval = 1800
+        log_err("Failed to determine runinterval, defaulting to #{runinterval} seconds")
+      end
+    rescue Exception => e
+      log_exception(e)
+      runinterval = 1800
+    end
+
+    runinterval
+  end
 end
 
 if __FILE__ == $0

data/install.rb

@@ -250,7 +250,7 @@ def prepare_installation
     begin
       require 'win32/dir'
     rescue LoadError => e
-      puts "Cannot run on Microsoft Windows without the sys-admin, win32-process, win32-dir & win32-service gems: #{e}"
+      puts "Cannot run on Microsoft Windows without the win32-process, win32-dir & win32-service gems: #{e}"
       exit -1
     end
     configdir = File.join(Dir::COMMON_APPDATA, "PuppetLabs", "puppet", "etc")

data/lib/puppet.rb

@@ -40,6 +40,27 @@ module Puppet
   # the hash that determines how our system behaves
   @@settings = Puppet::Settings.new
 
+  # Note: It's important that these accessors (`self.settings`, `self.[]`) are
+  # defined before we try to load any "features" (which happens a few lines below),
+  # because the implementation of the features loading may examine the values of
+  # settings.
+  def self.settings
+    @@settings
+  end
+
+  # Get the value for a setting
+  #
+  # @param [Symbol] param the setting to retrieve
+  #
+  # @api public
+  def self.[](param)
+    if param == :debug
+      return Puppet::Util::Log.level == :debug
+    else
+      return @@settings[param]
+    end
+  end
+
   # The services running in this process.
   @services ||= []
 
@@ -58,19 +79,6 @@ module Puppet
     @@settings.define_settings(section, hash)
   end
 
-  # Get the value for a setting
-  #
-  # @param [Symbol] param the setting to retrieve
-  #
-  # @api public
-  def self.[](param)
-    if param == :debug
-      return Puppet::Util::Log.level == :debug
-    else
-      return @@settings[param]
-    end
-  end
-
   # setting access and stuff
   def self.[]=(param,value)
     @@settings[param] = value
@@ -88,11 +96,6 @@ module Puppet
     end
   end
 
-  def self.settings
-    @@settings
-  end
-
-
   def self.run_mode
     # This sucks (the existence of this method); there are a lot of places in our code that branch based the value of
     # "run mode", but there used to be some really confusing code paths that made it almost impossible to determine
@@ -184,14 +187,21 @@ module Puppet
       loaders = Puppet::Environments::Directories.from_path(environments, modulepath)
       # in case the configured environment (used for the default sometimes)
       # doesn't exist
-      loaders << Puppet::Environments::StaticPrivate.new(
-        Puppet::Node::Environment.create(Puppet[:environment].to_sym,
-                                         [],
-                                         Puppet::Node::Environment::NO_MANIFEST))
+      default_environment = Puppet[:environment].to_sym
+      if default_environment == :production
+        loaders << Puppet::Environments::StaticPrivate.new(
+          Puppet::Node::Environment.create(Puppet[:environment].to_sym,
+                                           [],
+                                           Puppet::Node::Environment::NO_MANIFEST))
+      end
     end
 
     {
-      :environments => Puppet::Environments::Cached.new(*loaders)
+      :environments => Puppet::Environments::Cached.new(*loaders),
+      :http_pool => proc {
+        require 'puppet/network/http'
+        Puppet::Network::HTTP::NoCachePool.new
+      }
     }
   end
 
@@ -199,7 +209,7 @@ module Puppet
   # initialization where the {base_context} bindings are put in place
   # @api private
   def self.bootstrap_context
-    root_environment = Puppet::Node::Environment.create(:'*root*', [], '')
+    root_environment = Puppet::Node::Environment.create(:'*root*', [], Puppet::Node::Environment::NO_MANIFEST)
     {
       :current_environment => root_environment,
       :root_environment => root_environment