puppet 6.11.1-universal-darwin → 6.16.0-universal-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9aa8d24006adf210bcb3d05e6b03926cc20fa40d9569e9e432cd359e3d6bab64
-  data.tar.gz: 69b70c18e025253788528e6fefc7e463955670cfced1f0698d1544ff7bffd552
+  metadata.gz: f7064d29333b18df07d4c488db3f8467f20bdf950e574ef7ca69efdd9720b5a9
+  data.tar.gz: 8bc256737ac5510ee41887b4baa265192cabfcb5e9dd35845aaec43b878cece2
 SHA512:
-  metadata.gz: e8aaa2f5d7e3853adb54f7972f01e87a894dc47e274d4b33ec232e86f58fbebc6919305ee8e960a97217f1cfdd8a7f04605ef1c2a92da223940eb3bf96bd834d
-  data.tar.gz: e7685d1bbe530fabb7be6a206f0019b27925b8c2a79bfb18c32cad364a9076916c4b2ce9faf29df1942e46fb0314f6c31fa4a5a75281b1415255595967004759
+  metadata.gz: 9975d18863323ec983022ae7597cdf39881cae07bba8e1563979a0c56b7ae6ca7f78453c8298ab9f36cda3af743c9bc93c1c1b18114fa2ddaed28ba0683436cd
+  data.tar.gz: 346632f11b0236699c41b94994d76792d5fe8c5570b4ae7c6de3999ae7ece9f87ec94e7c924397994e050c385536a3a1559e67e82450c383e8f269ef52a27807

data/CODEOWNERS

@@ -1,5 +1,5 @@
 # default to platform-core
-* @puppetlabs/platform-core
+* @puppetlabs/platform-core @puppetlabs/puppetserver-maintainers
 
 # Night's Watch
 /lib/puppet/type/group @puppetlabs/night-s-watch
@@ -11,13 +11,8 @@
 /lib/puppet/provider/service @puppetlabs/night-s-watch
 /lib/puppet/provider/user @puppetlabs/night-s-watch
 
-# language
-/lib/puppet/datatypes @puppetlabs/language
-/lib/puppet/functions @puppetlabs/language
-/lib/puppet/pal @puppetlabs/language
-/lib/puppet/parser @puppetlabs/language
-/lib/puppet/pops @puppetlabs/language
-/lib/puppet/syntax_checkers @puppetlabs/language
+# PAL
+/lib/puppet/pal @puppetlabs/bolt
 
 # puppet device
 /lib/puppet/application/device.rb @puppetlabs/networking

data/CONTRIBUTING.md

@@ -28,7 +28,7 @@ the [puppet-dev mailing list](https://groups.google.com/forum/#!forum/puppet-dev
 ## Getting Started
 
 * Make sure you have a [Jira account](https://tickets.puppetlabs.com).
-* Make sure you have a [GitHub account](https://github.com/signup/free).
+* Make sure you have a [GitHub account](https://github.com/join).
 * Submit a Jira ticket for your issue if one does not already exist.
   * Clearly describe the issue including steps to reproduce when it is a bug.
   * Make sure you fill in the earliest version that you know has the issue.
@@ -89,7 +89,7 @@ user-facing strings are marked in new PRs before merging.
 
 For [changes of a trivial nature](https://puppet.com/community/trivial-patch-exemption-policy), it is not always necessary to create a new
 ticket in Jira. In this case, it is appropriate to start the first line of a
-commit with one of  `(docs)`, `(maint)`, or `(packaging)` instead of a ticket
+commit with one of `(docs)`, `(maint)`, or `(packaging)` instead of a ticket
 number.
 
 If a Jira ticket exists for the documentation commit, you can include it
@@ -117,15 +117,10 @@ respectively.
 * Sign the [Contributor License Agreement](https://cla.puppet.com).
 * Push your changes to a topic branch in your fork of the repository.
 * Submit a pull request to the repository in the puppetlabs organization.
-* Update your Jira ticket to mark that you have submitted code and are ready
+* Update the related Jira ticket to mark that you have submitted code and are ready
   for it to be reviewed (Status: Ready for Merge).
-  * Include a link to the pull request in the ticket.
-* The core team looks at Pull Requests on a regular basis in a weekly triage
-  meeting that we hold in a public Google Hangout. The hangout is announced in
-  the weekly status updates that are sent to the puppet-dev list. Notes are
-  posted to the [Puppet Community community-triage
-  repo](https://github.com/puppet-community/community-triage/tree/master/core/notes)
-  and include a link to a YouTube recording of the hangout.
+* The core team looks at pull requests on a regular basis in a weekly triage
+  meeting.
 * After feedback has been given we expect responses within two weeks. After two
   weeks we may close the pull request if it isn't showing any activity.
 
@@ -159,9 +154,8 @@ ensure the issue has been resolved.
 
 * [Puppet community guidelines](https://puppet.com/community/community-guidelines)
 * [Bug tracker (Jira)](https://tickets.puppetlabs.com)
-* [Contributor License Agreement](http://links.puppet.com/cla)
+* [Contributor License Agreement](https://cla.puppet.com/)
 * [General GitHub documentation](https://help.github.com/)
 * [GitHub pull request documentation](https://help.github.com/articles/creating-a-pull-request/)
-* #puppet-dev IRC channel on freenode.org ([Archive](https://botbot.me/freenode/puppet-dev/))
 * [puppet-dev mailing list](https://groups.google.com/forum/#!forum/puppet-dev)
-* [Community PR Triage notes](https://github.com/puppet-community/community-triage/tree/master/core/notes)
+* [Puppet community slack](https://slack.puppet.com)

data/Gemfile

@@ -14,6 +14,7 @@ end
 
 # override .gemspec deps - may issue warning depending on Bundler version
 gem "facter", *location_for(ENV['FACTER_LOCATION']) if ENV.has_key?('FACTER_LOCATION')
+gem "facter-ng", *location_for(ENV['FACTER_NG_LOCATION']) if ENV.has_key?('FACTER_NG_LOCATION')
 gem "hiera", *location_for(ENV['HIERA_LOCATION']) if ENV.has_key?('HIERA_LOCATION')
 gem "semantic_puppet", *location_for(ENV['SEMANTIC_PUPPET_LOCATION'] || ["~> 1.0"])
 gem "puppet-resource_api", *location_for(ENV['RESOURCE_API_LOCATION'] || ["~> 1.5"])

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    puppet (6.11.1)
+    puppet (6.16.0)
       CFPropertyList (~> 2.2)
       concurrent-ruby (~> 1.0)
       deep_merge (~> 1.0)
-      facter (>= 2.4.0, < 4)
+      facter (>= 2.4.0, < 5)
       fast_gettext (~> 1.1)
       hiera (>= 3.2.1, < 4)
       httpclient (~> 2.8)
@@ -22,63 +22,65 @@ GEM
     artifactory (2.8.2)
     ast (2.4.0)
     coderay (1.1.2)
-    concurrent-ruby (1.1.5)
+    concurrent-ruby (1.1.6)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
-    csv (3.1.2)
+    csv (3.1.5)
     deep_merge (1.2.1)
     diff-lcs (1.3)
     docopt (0.6.1)
-    facter (2.5.6)
+    facter (4.0.25)
+      hocon (~> 1.3)
+      thor (>= 1.0.1, < 2.0)
     fast_gettext (1.1.2)
     gettext (3.2.9)
       locale (>= 2.0.5)
       text (>= 1.3.0)
-    gettext-setup (0.31)
+    gettext-setup (0.34)
       fast_gettext (~> 1.1.0)
-      gettext (>= 3.0.2)
+      gettext (>= 3.0.2, < 3.3.0)
       locale
-    hashdiff (1.0.0)
+    hashdiff (1.0.1)
     hiera (3.6.0)
-    hiera-eyaml (3.1.1)
+    hiera-eyaml (3.2.0)
       highline (~> 1.6.19)
       optimist
     highline (1.6.21)
-    hocon (1.3.0)
+    hocon (1.3.1)
     hpricot (0.8.6)
     httpclient (2.8.3)
     json-schema (2.8.1)
       addressable (>= 2.4)
-    locale (2.1.2)
+    locale (2.1.3)
     memory_profiler (0.9.14)
-    method_source (0.9.2)
+    method_source (1.0.0)
     minitar (0.9)
-    msgpack (1.3.1)
+    msgpack (1.3.3)
     multi_json (1.14.1)
-    mustache (1.1.0)
-    optimist (3.0.0)
-    packaging (0.99.49)
+    mustache (1.1.1)
+    optimist (3.0.1)
+    packaging (0.99.61)
       artifactory (~> 2)
       rake (>= 12.3)
       release-metrics
-    parallel (1.19.0)
-    parser (2.6.5.0)
+    parallel (1.19.1)
+    parser (2.7.1.3)
       ast (~> 2.4.0)
     powerpack (0.1.2)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    public_suffix (4.0.1)
-    puppet-resource_api (1.8.7)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    public_suffix (4.0.5)
+    puppet-resource_api (1.8.13)
       hocon (>= 1.0)
-    puppetserver-ca (1.4.0)
-      facter (>= 2.0.1, < 4)
+    puppetserver-ca (1.8.0)
+      facter (>= 2.0.1, < 5)
     racc (1.4.9)
     rainbow (2.2.2)
       rake
     rake (12.3.3)
     rdiscount (2.2.0.1)
-    rdoc (6.2.0)
+    rdoc (6.2.1)
     release-metrics (1.1.0)
       csv
       docopt
@@ -90,18 +92,18 @@ GEM
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
       rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.0)
-      rspec-support (~> 3.9.0)
-    rspec-expectations (3.9.0)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-its (1.3.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-support (3.9.0)
+    rspec-support (3.9.3)
     rubocop (0.49.1)
       parallel (~> 1.10)
       parser (>= 2.3.3.1, < 3.0)
@@ -111,18 +113,19 @@ GEM
       unicode-display_width (~> 1.0, >= 1.0.1)
     rubocop-i18n (1.2.0)
       rubocop (~> 0.49.0)
-    ruby-prof (1.0.0)
+    ruby-prof (1.4.1)
     ruby-progressbar (1.10.1)
     safe_yaml (1.0.5)
     semantic_puppet (1.0.2)
     text (1.3.1)
-    unicode-display_width (1.6.0)
-    vcr (5.0.0)
-    webmock (3.7.6)
+    thor (1.0.1)
+    unicode-display_width (1.7.0)
+    vcr (5.1.0)
+    webmock (3.8.3)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    yard (0.9.20)
+    yard (0.9.25)
 
 PLATFORMS
   ruby

data/README.md

@@ -1,7 +1,6 @@
-Puppet
-======
+# Puppet
 
-[![Travis Status](https://travis-ci.org/puppetlabs/puppet.svg?branch=master)](https://travis-ci.org/puppetlabs/puppet)
+[![Travis Status](https://travis-ci.com/puppetlabs/puppet.svg?branch=master)](https://travis-ci.com/puppetlabs/puppet)
 [![Appveyor Status](https://ci.appveyor.com/api/projects/status/cvhpypd4504sevqq/branch/master?svg=true)](https://ci.appveyor.com/project/puppetlabs/puppet/branch/master)
 [![Gem Version](https://badge.fury.io/rb/puppet.svg)](https://badge.fury.io/rb/puppet)
 [![Inline docs](https://inch-ci.org/github/puppetlabs/puppet.svg)](https://inch-ci.org/github/puppetlabs/puppet)
@@ -10,20 +9,18 @@ Puppet, an automated administrative engine for your Linux, Unix, and Windows sys
 administrative tasks (such as adding users, installing packages, and updating server
 configurations) based on a centralized specification.
 
-Documentation
--------------
+## Documentation
 
 Documentation for Puppet and related projects can be found online at the
 [Puppet Docs site](https://puppet.com/docs).
 
-HTTP API
---------
+### HTTP API
+
 [HTTP API Index](https://puppet.com/docs/puppet/5.5/http_api/http_api_index.html)
 
-Installation
-------------
+## Installation
 
-The best way to run Puppet is with [Puppet Enterprise (PE)](https://puppet.com/puppet/puppet-enterprise),
+The best way to run Puppet is with [Puppet Enterprise (PE)](https://puppet.com/products/puppet-enterprise/),
 which also includes orchestration features, a web console, and professional support.
 The PE documentation is [available here.](https://puppet.com/docs/pe/latest)
 
@@ -33,8 +30,7 @@ To install an open source release of Puppet,
 If you need to run Puppet from source as a tester or developer,
 see the [Running Puppet from Source](https://docs.puppet.com/puppet/3.8/from_source.html) guide on the docs site.
 
-Developing and Contributing
-------
+## Developing and Contributing
 
 We'd love to get contributions from you! For a quick guide to getting your
 system setup for developing, take a look at our [Quickstart
@@ -45,32 +41,29 @@ in.
 For more complete docs on developing with Puppet, take a look at the
 rest of the [developer documents](https://github.com/puppetlabs/puppet/blob/master/docs/index.md).
 
-Licensing
----------
+## Licensing
 
 See [LICENSE](https://github.com/puppetlabs/puppet/blob/master/LICENSE) file. Puppet is licensed by Puppet, Inc. under the Apache license. Puppet, Inc. can be contacted at: info@puppet.com
 
-Support
--------
+## Support
 
-Please log tickets and issues at our [JIRA tracker](https://tickets.puppetlabs.com).  A [mailing
+Please log tickets and issues at our [JIRA tracker](https://tickets.puppetlabs.com). A [mailing
 list](https://groups.google.com/forum/?fromgroups#!forum/puppet-users) is
-available for asking questions and getting help from others. In addition, there
-is an active #puppet channel on Freenode.
+available for asking questions and getting help from others, or if you prefer chat, we also have a [Puppet Community slack.](https://puppetcommunity.slack.com/)
 
 We use semantic version numbers for our releases and recommend that users stay
 as up-to-date as possible by upgrading to patch releases and minor releases as
 they become available.
 
-Bugfixes and ongoing development will occur in minor releases for the current
+Bug fixes and ongoing development will occur in minor releases for the current
 major version. Security fixes will be backported to a previous major version on
 a best-effort basis, until the previous major version is no longer maintained.
 
-For example: If a security vulnerability is discovered in Puppet 4.1.1, we
-would fix it in the 4 series, most likely as 4.1.2. Maintainers would then make
-a best effort to backport that fix onto the latest Puppet 3 release.
+For example: If a security vulnerability is discovered in Puppet 6.1.1, we
+would fix it in the 6 series, most likely as 6.1.2. Maintainers would then make
+a best effort to backport that fix onto the latest Puppet 5 release.
 
 Long-term support, including security patches and bug fixes, is available for
 commercial customers. Please see the following page for more details:
 
-[Puppet Enterprise Support Lifecycle](https://puppet.com/misc/puppet-enterprise-lifecycle)
+[Puppet Enterprise Support Lifecycle](https://puppet.com/docs/puppet-enterprise/product-support-lifecycle/)

data/ext/build_defaults.yaml

@@ -16,3 +16,4 @@ apt_signing_server: 'apt.puppetlabs.com'
 apt_repo_url: 'http://apt.puppetlabs.com'
 apt_repo_path: '/opt/repository/incoming'
 tar_host: 'downloads.puppetlabs.com'
+nonfinal_gem_path: '/opt/repository-nightlies/downloads/gems/puppet6-nightly'

data/ext/project_data.yaml

@@ -17,7 +17,7 @@ gem_forge_project: 'puppet'
 gem_required_ruby_version: '>= 2.3.0'
 gem_required_rubygems_version: '> 1.3.1'
 gem_runtime_dependencies:
-  facter: ['> 2.0.1', '< 4']
+  facter: ['> 2.0.1', '< 5']
   hiera: ['>= 3.2.1', '< 4']
   semantic_puppet: '~> 1.0'
   fast_gettext: '~> 1.1'

data/ext/windows/service/daemon.rb

@@ -15,6 +15,7 @@ class WindowsDaemon < Win32::Daemon
 
   @run_thread = nil
   @LOG_TO_FILE = false
+  @loglevel = 0
   LOG_FILE =  File.expand_path(File.join(Dir::COMMON_APPDATA, 'PuppetLabs', 'puppet', 'var', 'log', 'windows.log'))
   LEVELS = [:debug, :info, :notice, :warning, :err, :alert, :emerg, :crit]
   LEVELS.each do |level|
@@ -27,9 +28,6 @@ class WindowsDaemon < Win32::Daemon
   end
 
   def service_main(*argsv)
-    base_dir = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-    load_env(base_dir)
-
     argsv = (argsv << ARGV).flatten.compact
     args = argsv.join(' ')
     @loglevel = LEVELS.index(argsv.index('--debug') ? :debug : :notice)
@@ -41,6 +39,9 @@ class WindowsDaemon < Win32::Daemon
       args = args.gsub("--logtofile","")
     end
 
+    base_dir = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+    load_env(base_dir)
+
     # The puppet installer registers a 'Puppet' event source.  For the moment events will be logged with this key, but
     # it may be a good idea to split the Service and Puppet events later so it's easier to read in the windows Event Log.
     #
@@ -159,7 +160,7 @@ class WindowsDaemon < Win32::Daemon
 
   def parse_runinterval(puppet_path)
     begin
-      runinterval = %x{ #{puppet_path} agent --configprint runinterval }.to_i
+      runinterval = %x{ #{puppet_path} config --section agent --log_level notice print runinterval }.to_i
       if runinterval == 0
         runinterval = 1800
         log_err("Failed to determine runinterval, defaulting to #{runinterval} seconds")
@@ -174,8 +175,8 @@ class WindowsDaemon < Win32::Daemon
 
   def parse_log_level(puppet_path,cmdline_debug)
     begin
-      loglevel = %x{ #{puppet_path} agent --configprint log_level}.chomp
-      unless loglevel
+      loglevel = %x{ #{puppet_path} config --section agent --log_level notice print log_level }.chomp
+      unless loglevel && respond_to?("log_#{loglevel}")
         loglevel = :notice
         log_err("Failed to determine loglevel, defaulting to #{loglevel}")
       end
@@ -190,20 +191,24 @@ class WindowsDaemon < Win32::Daemon
   private
 
   def load_env(base_dir)
-    # ENV that uses backward slashes
-    ENV['FACTER_env_windows_installdir'] = base_dir.tr('/', '\\')
-    ENV['PL_BASEDIR'] = base_dir.tr('/', '\\')
-    ENV['PUPPET_DIR'] = File.join(base_dir, 'puppet').tr('/', '\\')
-    ENV['OPENSSL_CONF'] = File.join(base_dir, 'puppet', 'ssl', 'openssl.cnf').tr('/', '\\')
-    ENV['SSL_CERT_DIR'] = File.join(base_dir, 'puppet', 'ssl', 'certs').tr('/', '\\')
-    ENV['SSL_CERT_FILE'] = File.join(base_dir, 'puppet', 'ssl', 'cert.pem').tr('/', '\\')
-    ENV['Path'] = [
-      File.join(base_dir, 'puppet', 'bin'),
-      File.join(base_dir, 'bin'),
-    ].join(';').tr('/', '\\') + ';' + ENV['Path']
-
-    # ENV that uses forward slashes
-    ENV['RUBYLIB'] = "#{File.join(base_dir, 'puppet','lib')};#{ENV['RUBYLIB']}"
+    begin
+      # ENV that uses backward slashes
+      ENV['FACTER_env_windows_installdir'] = base_dir.tr('/', '\\')
+      ENV['PL_BASEDIR'] = base_dir.tr('/', '\\')
+      ENV['PUPPET_DIR'] = File.join(base_dir, 'puppet').tr('/', '\\')
+      ENV['OPENSSL_CONF'] = File.join(base_dir, 'puppet', 'ssl', 'openssl.cnf').tr('/', '\\')
+      ENV['SSL_CERT_DIR'] = File.join(base_dir, 'puppet', 'ssl', 'certs').tr('/', '\\')
+      ENV['SSL_CERT_FILE'] = File.join(base_dir, 'puppet', 'ssl', 'cert.pem').tr('/', '\\')
+      ENV['Path'] = [
+        File.join(base_dir, 'puppet', 'bin'),
+        File.join(base_dir, 'bin'),
+      ].join(';').tr('/', '\\') + ';' + ENV['Path']
+
+      # ENV that uses forward slashes
+      ENV['RUBYLIB'] = "#{File.join(base_dir, 'puppet','lib')};#{ENV['RUBYLIB']}"
+    rescue => e
+      log_exception(e)
+    end
   end
 end
 

data/lib/puppet.rb

@@ -1,4 +1,5 @@
 require 'puppet/version'
+require 'puppet/concurrent/synchronized'
 
 if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new("2.3.0")
   raise LoadError, "Puppet #{Puppet.version} requires Ruby 2.3.0 or greater, found Ruby #{RUBY_VERSION.dup}."
@@ -6,6 +7,8 @@ end
 
 Puppet::OLDEST_RECOMMENDED_RUBY_VERSION = '2.3.0'
 
+$LOAD_PATH.extend(Puppet::Concurrent::Synchronized)
+
 # see the bottom of the file for further inclusions
 # Also see the new Vendor support - towards the end
 #
@@ -22,6 +25,7 @@ require 'puppet/external/pson/common'
 require 'puppet/external/pson/version'
 require 'puppet/external/pson/pure'
 require 'puppet/gettext/config'
+require 'puppet/defaults'
 
 
 #------------------------------------------------------------
@@ -60,6 +64,14 @@ module Puppet
     @@settings
   end
 
+  # The puppetserver project has its own settings class that is thread-aware; this
+  # method is here to allow the puppetserver to define its own custom settings class
+  # for multithreaded puppet. It is not intended for use outside of the puppetserver
+  # implmentation.
+  def self.replace_settings_object(new_settings)
+    @@settings = new_settings
+  end
+
   # Get the value for a setting
   #
   # @param [Symbol] param the setting to retrieve
@@ -87,6 +99,7 @@ module Puppet
 
   # Store a new default value.
   def self.define_settings(section, hash)
+    Puppet.deprecation_warning('The method Puppet.define_settings is deprecated and will be removed in a future release')
     @@settings.define_settings(section, hash)
   end
 
@@ -121,8 +134,9 @@ module Puppet
     Puppet::Util::RunMode[@@settings.preferred_run_mode]
   end
 
-  # Load all of the settings.
-  require 'puppet/defaults'
+  # Modify the settings with defaults defined in `initialize_default_settings` method in puppet/defaults.rb. This can
+  # be used in the initialization of new Puppet::Settings objects in the puppetserver project.
+  Puppet.initialize_default_settings!(settings)
 
   # Now that settings are loaded we have the code loaded to be able to issue
   # deprecation warnings. Warn if we're on a deprecated ruby version.
@@ -137,19 +151,47 @@ module Puppet
   #
   # @api public
   # @param args [Array<String>] the command line arguments to use for initialization
+  # @param require_config [Boolean] controls loading of Puppet configuration files
+  # @param global_settings [Boolean] controls push to global context after settings object initialization
+  # @param runtime_implementations [Hash<Symbol, Object>] runtime implementations to register
   # @return [void]
-  def self.initialize_settings(args = [], require_config = true)
-    do_initialize_settings_for_run_mode(:user, args, require_config)
+  def self.initialize_settings(args = [], require_config = true, push_settings_globally = true, runtime_implementations = {})
+    do_initialize_settings_for_run_mode(:user, args, require_config, push_settings_globally, runtime_implementations)
+  end
+
+  def self.vendored_modules
+    dir = Puppet[:vendormoduledir]
+    if dir && File.directory?(dir)
+      Dir.entries(dir)
+        .reject { |f| f =~ /^\./ }
+        .map { |f| File.join(dir, f, "lib") }
+        .select { |d| FileTest.directory?(d) }
+    else
+      []
+    end
+  end
+  private_class_method :vendored_modules
+
+  def self.initialize_load_path
+    $LOAD_PATH.unshift(Puppet[:libdir])
+    $LOAD_PATH.concat(vendored_modules)
   end
+  private_class_method :initialize_load_path
 
   # private helper method to provide the implementation details of initializing for a run mode,
   #  but allowing us to control where the deprecation warning is issued
-  def self.do_initialize_settings_for_run_mode(run_mode, args, require_config = true)
+  def self.do_initialize_settings_for_run_mode(run_mode, args, require_config, push_settings_globally, runtime_implementations)
     Puppet.settings.initialize_global_settings(args, require_config)
     run_mode = Puppet::Util::RunMode[run_mode]
     Puppet.settings.initialize_app_defaults(Puppet::Settings.app_defaults_for_run_mode(run_mode))
-    push_context_global(Puppet.base_context(Puppet.settings), "Initial context after settings initialization")
-    Puppet::Parser::Functions.reset
+    if push_settings_globally
+      initialize_load_path
+      push_context_global(Puppet.base_context(Puppet.settings), "Initial context after settings initialization")
+      Puppet::Parser::Functions.reset
+    end
+    runtime_implementations.each_pair do |name, impl|
+      Puppet.runtime[name] = impl
+    end
   end
   private_class_method :do_initialize_settings_for_run_mode
 
@@ -203,10 +245,7 @@ module Puppet
 
     {
       :environments => Puppet::Environments::Cached.new(Puppet::Environments::Combined.new(*loaders)),
-      :http_pool => proc {
-        require 'puppet/network/http'
-        Puppet::Network::HTTP::NoCachePool.new
-      },
+      :http_pool => proc { Puppet.runtime[:http].pool },
       :ssl_context => proc {
         begin
           cert = Puppet::X509::CertProvider.new
@@ -221,7 +260,8 @@ module Puppet
           raise e
         end
       },
-      :ssl_host => proc { Puppet::SSL::Host.localhost },
+      :ssl_host => proc { Puppet::SSL::Host.localhost(true) },
+      :http_session => proc { Puppet.runtime[:http].create_session },
       :plugins => proc { Puppet::Plugins::Configuration.load_plugins },
       :rich_data => false
     }
@@ -307,7 +347,6 @@ module Puppet
 
   require 'puppet/runtime'
   @runtime = Puppet::Runtime.instance
-  @runtime['http'] = proc { Puppet::HTTP::Client.new }
 end
 
 # This feels weird to me; I would really like for us to get to a state where there is never a "require" statement