puppet 3.6.2 → 3.7.0

data/lib/puppet/application.rb

@@ -354,7 +354,19 @@ class Application
     end
 
     Puppet.push_context(Puppet.base_context(Puppet.settings), "Update for application settings (#{self.class.run_mode})")
-    configured_environment = Puppet.lookup(:environments).get(Puppet[:environment])
+    # This use of configured environment is correct, this is used to establish
+    # the defaults for an application that does not override, or where an override
+    # has not been made from the command line.
+    #
+    configured_environment_name = Puppet[:environment]
+    if self.class.run_mode.name != :agent
+      configured_environment = Puppet.lookup(:environments).get(configured_environment_name)
+      if configured_environment.nil?
+        fail(Puppet::Environments::EnvironmentNotFound, configured_environment_name)
+      end
+    else
+      configured_environment = Puppet::Node::Environment.remote(configured_environment_name)
+    end
     configured_environment = configured_environment.override_from_commandline(Puppet.settings)
 
     # Setup a new context using the app's configuration
@@ -368,6 +380,7 @@ class Application
     exit_on_fail("parse application options")                    { plugin_hook('parse_options') { parse_options } }
     exit_on_fail("prepare for execution")                        { plugin_hook('setup')         { setup } }
     exit_on_fail("configure routes from #{Puppet[:route_file]}") { configure_indirector_routes }
+    exit_on_fail("log runtime debug info")                       { log_runtime_environment }
     exit_on_fail("run")                                          { plugin_hook('run_command')   { run_command } }
   end
 
@@ -419,6 +432,26 @@ class Application
     end
   end
 
+  # Output basic information about the runtime environment for debugging
+  # purposes.
+  #
+  # @api public
+  #
+  # @param extra_info [Hash{String => #to_s}] a flat hash of extra information
+  #   to log. Intended to be passed to super by subclasses.
+  # @return [void]
+  def log_runtime_environment(extra_info=nil)
+    runtime_info = {
+      'puppet_version' => Puppet.version,
+      'ruby_version'   => RUBY_VERSION,
+      'run_mode'       => self.class.run_mode.name,
+    }
+    runtime_info['default_encoding'] = Encoding.default_external if RUBY_VERSION >= '1.9.3'
+    runtime_info.merge!(extra_info) unless extra_info.nil?
+
+    Puppet.debug 'Runtime environment: ' + runtime_info.map{|k,v| k + '=' + v.to_s}.join(', ')
+  end
+
   def parse_options
     # Create an option parser
     option_parser = OptionParser.new(self.class.banner)

data/lib/puppet/application/agent.rb

@@ -91,11 +91,11 @@ similar), or run interactively for testing purposes.
 
 USAGE
 -----
-puppet agent [--certname <name>] [-D|--daemonize|--no-daemonize]
-  [-d|--debug] [--detailed-exitcodes] [--digest <digest>] [--disable [message]] [--enable]
-  [--fingerprint] [-h|--help] [-l|--logdest syslog|<file>|console]
-  [--no-client] [--noop] [-o|--onetime] [-t|--test]
-  [-v|--verbose] [-V|--version] [-w|--waitforcert <seconds>]
+puppet agent [--certname <NAME>] [-D|--daemonize|--no-daemonize]
+  [-d|--debug] [--detailed-exitcodes] [--digest <DIGEST>] [--disable [MESSAGE]] [--enable]
+  [--fingerprint] [-h|--help] [-l|--logdest syslog|eventlog|<FILE>|console]
+  [--masterport <PORT>] [--no-client] [--noop] [-o|--onetime] [-t|--test]
+  [-v|--verbose] [-V|--version] [-w|--waitforcert <SECONDS>]
 
 
 DESCRIPTION
@@ -226,9 +226,10 @@ generated by running puppet agent with '--genconfig'.
   Print this help message
 
 * --logdest:
-  Where to send messages. Choose between syslog, the console, and a log
-  file. Defaults to sending messages to syslog, or the console if
-  debugging or verbosity is enabled.
+  Where to send log messages. Choose between 'syslog' (the POSIX syslog
+  service), 'eventlog' (the Windows Event Log), 'console', or the path to a log
+  file. If debugging or verbosity is enabled, this defaults to 'console'.
+  Otherwise, it defaults to 'syslog' on POSIX systems and 'eventlog' on Windows.
 
 * --masterport:
   The port on which to contact the puppet master.

data/lib/puppet/application/apply.rb

@@ -1,5 +1,6 @@
 require 'puppet/application'
 require 'puppet/configurer'
+require 'puppet/util/profiler/aggregate'
 
 class Puppet::Application::Apply < Puppet::Application
 
@@ -42,7 +43,8 @@ Applies a standalone Puppet manifest to the local system.
 USAGE
 -----
 puppet apply [-h|--help] [-V|--version] [-d|--debug] [-v|--verbose]
-  [-e|--execute] [--detailed-exitcodes] [-l|--logdest <file>] [--noop]
+  [-e|--execute] [--detailed-exitcodes] [-L|--loadclasses]
+  [-l|--logdest syslog|eventlog|<FILE>|console] [--noop]
   [--catalog <catalog>] [--write-catalog-summary] <file>
 
 
@@ -93,8 +95,9 @@ configuration options can also be generated by running puppet with
   all of those classes to be set in your puppet manifest.
 
 * --logdest:
-  Where to send messages. Choose between syslog, the console, and a log
-  file. Defaults to sending messages to the console.
+  Where to send log messages. Choose between 'syslog' (the POSIX syslog
+  service), 'eventlog' (the Windows Event Log), 'console', or the path to a log
+  file. Defaults to 'console'.
 
 * --noop:
   Use 'noop' mode where Puppet runs in a no-op or dry-run mode. This
@@ -187,7 +190,7 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
       configured_environment.override_with(:manifest => manifest) :
       configured_environment
 
-    Puppet.override(:environments => Puppet::Environments::Static.new(apply_environment)) do
+    Puppet.override({:current_environment => apply_environment}, "For puppet apply") do
       # Find our Node
       unless node = Puppet::Node.indirection.find(Puppet[:node_name_value])
         raise "Could not find node #{Puppet[:node_name_value]}"
@@ -239,6 +242,12 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
         exit(1)
       end
     end
+
+  ensure
+    if @profiler
+      Puppet::Util::Profiler.remove_profiler(@profiler)
+      @profiler.shutdown
+    end
   end
 
   # Enable all of the most common test options.
@@ -266,7 +275,7 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
     set_log_level
 
     if Puppet[:profile]
-      Puppet::Util::Profiler.current = Puppet::Util::Profiler::WallClock.new(Puppet.method(:debug), "apply")
+      @profiler = Puppet::Util::Profiler.add_profiler(Puppet::Util::Profiler::Aggregate.new(Puppet.method(:debug), "apply"))
     end
   end
 

data/lib/puppet/application/doc.rb

@@ -59,12 +59,10 @@ SYNOPSIS
 Generates a reference for all Puppet types. Largely meant for internal
 Puppet Labs use.
 
-WARNING: RDoc support is only available under Ruby 1.8.7 and earlier.
-
 
 USAGE
 -----
-puppet doc [-a|--all] [-h|--help] [-o|--outputdir <rdoc-outputdir>]
+puppet doc [-a|--all] [-h|--help] [-l|--list] [-o|--outputdir <rdoc-outputdir>]
   [-m|--mode text|pdf|rdoc] [-r|--reference <reference-name>]
   [--charset <charset>] [<manifest-file>]
 
@@ -84,11 +82,6 @@ can be changed with the 'outputdir' option.
 If the command is run with the name of a manifest file as an argument,
 puppet doc will output a single manifest's documentation on stdout.
 
-WARNING: RDoc support is only available under Ruby 1.8.7 and earlier.
-The internal API used to support manifest documentation has changed
-radically in newer versions, and support is not yet available for
-using those versions of RDoc.
-
 
 OPTIONS
 -------
@@ -164,16 +157,16 @@ HELP
   end
 
   def run_command
-    return[:rdoc].include?(options[:mode]) ? send(options[:mode]) : other
+    return [:rdoc].include?(options[:mode]) ? send(options[:mode]) : other
   end
 
   def rdoc
     exit_code = 0
     files = []
     unless @manifest
-      env = Puppet.lookup(:environments).get(Puppet[:environment])
+      env = Puppet.lookup(:current_environment)
       files += env.modulepath
-      files << ::File.dirname(env.manifest)
+      files << ::File.dirname(env.manifest) if env.manifest != Puppet::Node::Environment::NO_MANIFEST
     end
     files += command_line.args
     Puppet.info "scanning: #{files.inspect}"

data/lib/puppet/application/master.rb

@@ -40,8 +40,8 @@ default.
 USAGE
 -----
 puppet master [-D|--daemonize|--no-daemonize] [-d|--debug] [-h|--help]
-  [-l|--logdest <file>|console|syslog] [-v|--verbose] [-V|--version]
-  [--compile <node-name>]
+  [-l|--logdest syslog|<FILE>|console] [-v|--verbose] [-V|--version]
+  [--compile <NODE-NAME>]
 
 
 DESCRIPTION
@@ -82,9 +82,9 @@ generated by running puppet master with '--genconfig'.
   Print this help message.
 
 * --logdest:
-  Where to send messages. Choose between syslog, the console, and a log
-  file. Defaults to sending messages to syslog, or the console if
-  debugging or verbosity is enabled.
+  Where to send log messages. Choose between 'syslog' (the POSIX syslog
+  service), 'console', or the path to a log file. If debugging or verbosity is
+  enabled, this defaults to 'console'. Otherwise, it defaults to 'syslog'.
 
 * --masterport:
   The port on which to listen for traffic.
@@ -162,7 +162,6 @@ Copyright (c) 2012 Puppet Labs, LLC Licensed under the Apache 2.0 License
   end
 
   def compile
-    Puppet::Util::Log.newdestination :console
     begin
       unless catalog = Puppet::Resource::Catalog.indirection.find(options[:node])
         raise "Could not compile catalog for #{options[:node]}"
@@ -202,21 +201,24 @@ Copyright (c) 2012 Puppet Labs, LLC Licensed under the Apache 2.0 License
   end
 
   def setup_logs
-    # Handle the logging settings.
-    if options[:debug] or options[:verbose]
-      if options[:debug]
-        Puppet::Util::Log.level = :debug
-      else
-        Puppet::Util::Log.level = :info
-      end
+    set_log_level
 
-      unless Puppet[:daemonize] or options[:rack]
+    if !options[:setdest]
+      if options[:node]
+        # We are compiling a catalog for a single node with '--compile' and logging
+        # has not already been configured via '--logdest' so log to the console.
+        Puppet::Util::Log.newdestination(:console)
+      elsif !(Puppet[:daemonize] or options[:rack])
+        # We are running a webrick master which has been explicitly foregrounded
+        # and '--logdest' has not been passed, assume users want to see logging
+        # and log to the console.
         Puppet::Util::Log.newdestination(:console)
-        options[:setdest] = true
+      else
+        # No explicit log destination has been given with '--logdest' and we're
+        # either a daemonized webrick master or running under rack, log to syslog.
+        Puppet::Util::Log.newdestination(:syslog)
       end
     end
-
-    Puppet::Util::Log.newdestination(:syslog) unless options[:setdest]
   end
 
   def setup_terminuses

data/lib/puppet/application/queue.rb

@@ -53,7 +53,7 @@ them in order. THIS FEATURE IS DEPRECATED; use PuppetDB instead.
 
 USAGE
 -----
-puppet queue [-d|--debug] [-v|--verbose]
+puppet queue [-d|--debug] [--help] [-v|--verbose] [--version]
 
 
 DESCRIPTION

data/lib/puppet/application/resource.rb

@@ -6,7 +6,6 @@ class Puppet::Application::Resource < Puppet::Application
 
   def preinit
     @extra_params = []
-    Facter.loadfacts
   end
 
   option("--debug","-d")

data/lib/puppet/configurer.rb

@@ -8,9 +8,9 @@ require 'securerandom'
 class Puppet::Configurer
   require 'puppet/configurer/fact_handler'
   require 'puppet/configurer/plugin_handler'
+  require 'puppet/configurer/downloader_factory'
 
   include Puppet::Configurer::FactHandler
-  include Puppet::Configurer::PluginHandler
 
   # For benchmarking
   include Puppet::Util
@@ -44,13 +44,14 @@ class Puppet::Configurer
     end
   end
 
-  def initialize
+  def initialize(factory = Puppet::Configurer::DownloaderFactory.new)
     Puppet.settings.use(:main, :ssl, :agent)
 
     @running = false
     @splayed = false
     @environment = Puppet[:environment]
     @transaction_uuid = SecureRandom.uuid
+    @handler = Puppet::Configurer::PluginHandler.new(factory)
   end
 
   # Get the remote catalog, yo.  Returns nil if no catalog can be found.
@@ -125,6 +126,17 @@ class Puppet::Configurer
   # This just passes any options on to the catalog,
   # which accepts :tags and :ignoreschedules.
   def run(options = {})
+    pool = Puppet::Network::HTTP::Pool.new(Puppet[:http_keepalive_timeout])
+    begin
+      Puppet.override(:http_pool => pool) do
+        run_internal(options)
+      end
+    ensure
+      pool.close
+    end
+  end
+
+  def run_internal(options)
     # We create the report pre-populated with default settings for
     # environment and transaction_uuid very early, this is to ensure
     # they are sent regardless of any catalog compilation failures or
@@ -146,6 +158,13 @@ class Puppet::Configurer
           if node = Puppet::Node.indirection.find(Puppet[:node_name_value],
               :environment => @environment, :ignore_cache => true, :transaction_uuid => @transaction_uuid,
               :fail_on_404 => true)
+
+            # If we have deserialized a node from a rest call, we want to set
+            # an environment instance as a simple 'remote' environment reference.
+            if !node.has_environment_instance? && node.environment_name
+              node.environment = Puppet::Node::Environment.remote(node.environment_name)
+            end
+
             if node.environment.to_s != @environment
               Puppet.warning "Local environment: \"#{@environment}\" doesn't match server specified node environment \"#{node.environment}\", switching agent to \"#{node.environment}\"."
               @environment = node.environment.to_s
@@ -161,6 +180,18 @@ class Puppet::Configurer
         end
       end
 
+      current_environment = Puppet.lookup(:current_environment)
+      local_node_environment =
+      if current_environment.name == @environment.intern
+        current_environment
+      else
+        Puppet::Node::Environment.create(@environment,
+                                         current_environment.modulepath,
+                                         current_environment.manifest,
+                                         current_environment.config_version)
+      end
+      Puppet.push_context({:current_environment => local_node_environment}, "Local node environment for configurer transaction")
+
       query_options = get_facts(options) unless query_options
 
       # get_facts returns nil during puppet apply
@@ -204,7 +235,9 @@ class Puppet::Configurer
 
     Puppet::Util::Log.close(report)
     send_report(report)
+    Puppet.pop_context
   end
+  private :run_internal
 
   def send_report(report)
     puts report.summary if Puppet[:summarize]
@@ -263,4 +296,8 @@ class Puppet::Configurer
     Puppet.log_exception(detail, "Could not retrieve catalog from remote server: #{detail}")
     return nil
   end
+
+  def download_plugins(remote_environment_for_plugins)
+    @handler.download_plugins(remote_environment_for_plugins)
+  end
 end

data/lib/puppet/configurer/downloader.rb

@@ -10,18 +10,15 @@ class Puppet::Configurer::Downloader
 
     files = []
     begin
-      ::Timeout.timeout(Puppet[:configtimeout]) do
-        catalog.apply do |trans|
-          trans.changed?.find_all do |resource|
-            yield resource if block_given?
-            files << resource[:path]
-          end
+      catalog.apply do |trans|
+        trans.changed?.each do |resource|
+          yield resource if block_given?
+          files << resource[:path]
         end
       end
-    rescue Puppet::Error, Timeout::Error => detail
+    rescue Puppet::Error => detail
       Puppet.log_exception(detail, "Could not retrieve #{name}: #{detail}")
     end
-
     files
   end
 
@@ -44,8 +41,6 @@ class Puppet::Configurer::Downloader
 
   private
 
-  require 'sys/admin' if Puppet.features.microsoft_windows?
-
   def default_arguments
     defargs = {
       :path => path,

data/lib/puppet/configurer/downloader_factory.rb

@@ -0,0 +1,34 @@
+require 'puppet/configurer'
+
+# Factory for <tt>Puppet::Configurer::Downloader</tt> objects.
+#
+# Puppet's pluginsync facilities can be used to download modules
+# and external facts, each with a different destination directory
+# and related settings.
+#
+# @api private
+#
+class Puppet::Configurer::DownloaderFactory
+  def create_plugin_downloader(environment)
+    plugin_downloader = Puppet::Configurer::Downloader.new(
+      "plugin",
+      Puppet[:plugindest],
+      Puppet[:pluginsource],
+      Puppet[:pluginsignore],
+      environment
+    )
+  end
+
+  def create_plugin_facts_downloader(environment)
+    source_permissions = Puppet.features.microsoft_windows? ? :ignore : :use
+
+    plugin_fact_downloader = Puppet::Configurer::Downloader.new(
+      "pluginfacts",
+      Puppet[:pluginfactdest],
+      Puppet[:pluginfactsource],
+      Puppet[:pluginsignore],
+      environment,
+      source_permissions
+    )
+  end
+end

data/lib/puppet/configurer/plugin_handler.rb

@@ -1,26 +1,20 @@
 # Break out the code related to plugins.  This module is
 # just included into the agent, but having it here makes it
 # easier to test.
-module Puppet::Configurer::PluginHandler
+require 'puppet/configurer'
+
+class Puppet::Configurer::PluginHandler
+  def initialize(factory)
+    @factory = factory
+  end
+
   # Retrieve facts from the central server.
   def download_plugins(environment)
-    plugin_downloader = Puppet::Configurer::Downloader.new(
-      "plugin",
-      Puppet[:plugindest],
-      Puppet[:pluginsource],
-      Puppet[:pluginsignore],
-      environment
-    )
+    plugin_downloader = @factory.create_plugin_downloader(environment)
+
     if Puppet.features.external_facts?
-       plugin_fact_downloader = Puppet::Configurer::Downloader.new(
-          "pluginfacts",
-          Puppet[:pluginfactdest],
-          Puppet[:pluginfactsource],
-          Puppet[:pluginsignore],
-          environment,
-          :use
-       )
-       plugin_fact_downloader.evaluate
+      plugin_fact_downloader = @factory.create_plugin_facts_downloader(environment)
+      plugin_fact_downloader.evaluate
     end
 
     plugin_downloader.evaluate