puppet 3.8.7 → 4.0.0.rc1

data/lib/puppet/agent.rb

@@ -45,9 +45,7 @@ class Puppet::Agent
           begin
             client_args = client_options.merge(:pluginsync => Puppet[:pluginsync])
             lock { client.run(client_args) }
-          rescue SystemExit,NoMemoryError
-            raise
-          rescue Exception => detail
+          rescue StandardError => detail
             Puppet.log_exception(detail, "Could not run #{client_class}: #{detail}")
           end
         end
@@ -108,9 +106,7 @@ class Puppet::Agent
   def with_client
     begin
       @client = client_class.new
-    rescue SystemExit,NoMemoryError
-      raise
-    rescue Exception => detail
+    rescue StandardError => detail
       Puppet.log_exception(detail, "Could not create instance of #{client_class}: #{detail}")
       return
     end

data/lib/puppet/application.rb

@@ -1,8 +1,8 @@
 require 'optparse'
 require 'puppet/util/command_line'
-require 'puppet/util/plugins'
 require 'puppet/util/constant_inflector'
 require 'puppet/error'
+require 'puppet/application_support'
 
 module Puppet
 
@@ -181,23 +181,6 @@ class Application
       result
     end
 
-    SHOULD_PARSE_CONFIG_DEPRECATION_MSG = "is no longer supported; config file parsing " +
-        "is now controlled by the puppet engine, rather than by individual applications.  This " +
-        "method will be removed in a future version of puppet."
-
-    def should_parse_config
-      Puppet.deprecation_warning("should_parse_config " + SHOULD_PARSE_CONFIG_DEPRECATION_MSG)
-    end
-
-    def should_not_parse_config
-      Puppet.deprecation_warning("should_not_parse_config " + SHOULD_PARSE_CONFIG_DEPRECATION_MSG)
-    end
-
-    def should_parse_config?
-      Puppet.deprecation_warning("should_parse_config? " + SHOULD_PARSE_CONFIG_DEPRECATION_MSG)
-      true
-    end
-
     # used to declare code that handle an option
     def option(*options, &block)
       long = options.find { |opt| opt =~ /^--/ }.gsub(/^--(?:\[no-\])?([^ =]+).*$/, '\1' ).gsub('-','_')
@@ -345,40 +328,20 @@ class Application
   def run
 
     # I don't really like the names of these lifecycle phases.  It would be nice to change them to some more meaningful
-    # names, and make deprecated aliases.  Also, Daniel suggests that we can probably get rid of this "plugin_hook"
-    # pattern, but we need to check with PE and the community first.  --cprice 2012-03-16
-    #
+    # names, and make deprecated aliases.  --cprice 2012-03-16
 
     exit_on_fail("get application-specific default settings") do
-      plugin_hook('initialize_app_defaults') { initialize_app_defaults }
+      initialize_app_defaults
     end
 
-    Puppet.push_context(Puppet.base_context(Puppet.settings), "Update for application settings (#{self.class.run_mode})")
-    # 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::Node::Environment.remote(configured_environment_name)
-    else
-      configured_environment = Puppet.lookup(:environments).get!(configured_environment_name)
-    end
-    configured_environment = configured_environment.override_from_commandline(Puppet.settings)
-
-    # Setup a new context using the app's configuration
-    Puppet.push_context({ :current_environment => configured_environment },
-                    "Update current environment from application's configuration")
+    Puppet::ApplicationSupport.push_application_context(self.class.run_mode)
 
-    require 'puppet/util/instrumentation'
-    Puppet::Util::Instrumentation.init
-
-    exit_on_fail("initialize")                                   { plugin_hook('preinit')       { preinit } }
-    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("initialize")                                   { preinit }
+    exit_on_fail("parse application options")                    { parse_options }
+    exit_on_fail("prepare for execution")                        { 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 } }
+    exit_on_fail("run")                                          { run_command }
   end
 
   def main
@@ -403,10 +366,11 @@ class Application
     Puppet::Util::Log.setup_default unless options[:setdest]
   end
 
-  def set_log_level
-    if options[:debug]
+  def set_log_level(opts = nil)
+    opts ||= options
+    if opts[:debug]
       Puppet::Util::Log.level = :debug
-    elsif options[:verbose]
+    elsif opts[:verbose] && !Puppet::Util::Log.sendlevel?(:info)
       Puppet::Util::Log.level = :info
     end
   end
@@ -421,12 +385,7 @@ class Application
   end
 
   def configure_indirector_routes
-    route_file = Puppet[:route_file]
-    if Puppet::FileSystem.exist?(route_file)
-      routes = YAML.load_file(route_file)
-      application_routes = routes[name.to_s]
-      Puppet::Indirector.configure_routes(application_routes) if application_routes
-    end
+    Puppet::ApplicationSupport.configure_indirector_routes(name.to_s)
   end
 
   # Output basic information about the runtime environment for debugging
@@ -443,7 +402,7 @@ class Application
       '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['default_encoding'] = Encoding.default_external
     runtime_info.merge!(extra_info) unless extra_info.nil?
 
     Puppet.debug 'Runtime environment: ' + runtime_info.map{|k,v| k + '=' + v.to_s}.join(', ')
@@ -499,15 +458,5 @@ class Application
   def help
     "No help available for puppet #{name}"
   end
-
-
-
-  def plugin_hook(step,&block)
-    Puppet::Plugins.send("before_application_#{step}",:application_object => self)
-    x = yield
-    Puppet::Plugins.send("after_application_#{step}",:application_object => self, :return_value => x)
-    x
-  end
-  private :plugin_hook
 end
 end

data/lib/puppet/application/agent.rb

@@ -1,7 +1,9 @@
 require 'puppet/application'
-require 'puppet/run'
 require 'puppet/daemon'
 require 'puppet/util/pidlock'
+require 'puppet/agent'
+require 'puppet/configurer'
+require 'puppet/ssl/oids'
 
 class Puppet::Application::Agent < Puppet::Application
 
@@ -31,7 +33,6 @@ class Puppet::Application::Agent < Puppet::Application
       :setdest => false,
       :enable => false,
       :disable => false,
-      :client => true,
       :fqdn => nil,
       :serve => [],
       :digest => 'SHA256',
@@ -58,10 +59,6 @@ class Puppet::Application::Agent < Puppet::Application
   option("--fingerprint")
   option("--digest DIGEST")
 
-  option("--no-client") do |arg|
-    options[:client] = false
-  end
-
   option("--detailed-exitcodes") do |arg|
     options[:detailed_exitcodes] = true
   end
@@ -94,7 +91,7 @@ USAGE
 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]
+  [--masterport <PORT>] [--noop] [-o|--onetime] [-t|--test]
   [-v|--verbose] [-V|--version] [-w|--waitforcert <SECONDS>]
 
 
@@ -231,21 +228,10 @@ generated by running puppet agent with '--genconfig'.
   file. If debugging or verbosity is enabled, this defaults to 'console'.
   Otherwise, it defaults to 'syslog' on POSIX systems and 'eventlog' on Windows.
 
-  A path ending with '.json' will receive structured output in JSON format. The
-  log file will not have an ending ']' automatically written to it due to the
-  appending nature of logging. It must be appended manually to make the content
-  valid JSON.
-
 * --masterport:
   The port on which to contact the puppet master.
   (This is a Puppet setting, and can go in puppet.conf.)
 
-* --no-client:
-  Do not create a config client. This will cause the daemon to start
-  but not check configuration unless it is triggered with `puppet
-  kick`. This only makes sense when puppet agent is being run with
-  listen = true in puppet.conf or was started with the `--listen` option.
-
 * --noop:
   Use 'noop' mode where the daemon runs in a no-op or dry-run mode. This
   is useful for seeing what changes Puppet will make without actually
@@ -345,18 +331,7 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
   end
 
   def onetime(daemon)
-    if Puppet[:listen]
-      Puppet.notice "Ignoring --listen on onetime run"
-    end
-
-    unless options[:client]
-      Puppet.err "onetime is specified but there is no client"
-      exit(43)
-      return
-    end
-
     daemon.set_signal_traps
-
     begin
       exitstatus = daemon.agent.run
     rescue => detail
@@ -375,11 +350,7 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
   end
 
   def main(daemon)
-    if Puppet[:listen]
-      setup_listen(daemon)
-    end
     Puppet.notice "Starting Puppet client version #{Puppet.version}"
-
     daemon.start
   end
 
@@ -402,16 +373,14 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
 
     exit(Puppet.settings.print_configs ? 0 : 1) if Puppet.settings.print_configs?
 
+    Puppet::SSL::Oids.register_puppet_oids
+
     if options[:fqdn]
       Puppet[:certname] = options[:fqdn]
     end
 
     Puppet.settings.use :main, :agent, :ssl
 
-    # Always ignoreimport for agent. It really shouldn't even try to import,
-    # but this is just a temporary band-aid.
-    Puppet[:ignoreimport] = true
-
     Puppet::Transaction::Report.indirection.terminus_class = :rest
     # we want the last report to be persisted locally
     Puppet::Transaction::Report.indirection.cache_class = :yaml
@@ -441,30 +410,12 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
     exit(0)
   end
 
-  def setup_listen(daemon)
-    Puppet.warning "Puppet --listen / kick is deprecated. See http://links.puppetlabs.com/puppet-kick-deprecation"
-    unless Puppet::FileSystem.exist?(Puppet[:rest_authconfig])
-      Puppet.err "Will not start without authorization file #{Puppet[:rest_authconfig]}"
-      exit(14)
-    end
-
-    require 'puppet/network/server'
-    # No REST handlers yet.
-    server = Puppet::Network::Server.new(Puppet[:bindaddress], Puppet[:puppetport])
-
-    daemon.server = server
-  end
-
   def setup_agent
-    # We need to make the client either way, we just don't start it
-    # if --no-client is set.
-    require 'puppet/agent'
-    require 'puppet/configurer'
     agent = Puppet::Agent.new(Puppet::Configurer, (not(Puppet[:onetime])))
 
     enable_disable_client(agent) if options[:enable] or options[:disable]
 
-    @agent = agent if options[:client]
+    @agent = agent
   end
 
   def daemonize_process_when(should_daemonize)

data/lib/puppet/application/apply.rb

@@ -91,7 +91,7 @@ configuration options can also be generated by running puppet with
 
 * --loadclasses:
   Load any stored classes. 'puppet agent' caches configured classes
-  (usually at /etc/puppet/classes.txt), and setting this option causes
+  (usually at /etc/puppetlabs/puppet/classes.txt), and setting this option causes
   all of those classes to be set in your puppet manifest.
 
 * --logdest:
@@ -99,11 +99,6 @@ configuration options can also be generated by running puppet with
   service), 'eventlog' (the Windows Event Log), 'console', or the path to a log
   file. Defaults to 'console'.
 
-  A path ending with '.json' will receive structured output in JSON format. The
-  log file will not have an ending ']' automatically written to it due to the
-  appending nature of logging. It must be appended manually to make the content
-  valid JSON.
-
 * --noop:
   Use 'noop' mode where Puppet runs in a no-op or dry-run mode. This
   is useful for seeing what changes Puppet will make without actually

data/lib/puppet/application/ca.rb

@@ -1,5 +1,10 @@
 require 'puppet/application/face_base'
+require 'puppet/ssl/oids'
 
 class Puppet::Application::Ca < Puppet::Application::FaceBase
   run_mode :master
+
+  def setup
+    Puppet::SSL::Oids.register_puppet_oids
+  end
 end

data/lib/puppet/application/cert.rb

@@ -34,7 +34,8 @@ class Puppet::Application::Cert < Puppet::Application
   end
 
   option("--debug", "-d") do |arg|
-    Puppet::Util::Log.level = :debug
+    options[:debug] = true
+    set_log_level
   end
 
   option("--list", "-l") do |arg|
@@ -74,7 +75,8 @@ class Puppet::Application::Cert < Puppet::Application
   end
 
   option("--verbose", "-v") do |arg|
-    Puppet::Util::Log.level = :info
+    options[:verbose] = true
+    set_log_level
   end
 
   def help
@@ -167,7 +169,7 @@ configuration options can also be generated by running puppet cert with
 
 * --all:
   Operate on all items. Currently only makes sense with the 'sign',
-  'clean', 'list', and 'fingerprint' actions.
+  'list', and 'fingerprint' actions.
 
 * --digest:
   Set the digest for fingerprinting (defaults to the digest used when
@@ -227,6 +229,8 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
     require 'puppet/ssl/certificate_authority'
     exit(Puppet.settings.print_configs ? 0 : 1) if Puppet.settings.print_configs?
 
+    Puppet::SSL::Oids.register_puppet_oids
+
     Puppet::Util::Log.newdestination :console
 
     if [:generate, :destroy].include? subcommand

data/lib/puppet/application/certificate.rb

@@ -1,7 +1,9 @@
 require 'puppet/application/indirection_base'
+require 'puppet/ssl/oids'
 
 class Puppet::Application::Certificate < Puppet::Application::IndirectionBase
   def setup
+    Puppet::SSL::Oids.register_puppet_oids
     location = Puppet::SSL::Host.ca_location
     if location == :local && !Puppet::SSL::CertificateAuthority.ca?
       # I'd prefer if this could be dealt with differently; ideally, run_mode should be set as

data/lib/puppet/application/device.rb

@@ -66,7 +66,7 @@ puppet-device(8) -- Manage remote network devices
 SYNOPSIS
 --------
 Retrieves all configurations from the puppet master and apply
-them to the remote devices configured in /etc/puppet/device.conf.
+them to the remote devices configured in /etc/puppetlabs/puppet/device.conf.
 
 Currently must be run out periodically, using cron or something similar.
 
@@ -84,7 +84,7 @@ retrieve its configuration and apply it.
 
 USAGE NOTES
 -----------
-One need a /etc/puppet/device.conf file with the following content:
+One need a /etc/puppetlabs/puppet/device.conf file with the following content:
 
 [remote.device.fqdn]
 type <type>
@@ -115,23 +115,17 @@ parameter, so you can specify '--server <servername>' as an argument.
 
 * --detailed-exitcodes:
   Provide transaction information via exit codes. If this is enabled, an exit
-  code of '1' means at least one device had a compile failure, an exit code of
-  '2' means at least one device had resource changes, and an exit code of '4'
-  means at least one device had resource failures. Exit codes of '3', '5', '6',
-  or '7' means that a bitwise combination of the preceeding exit codes happened.
+  code of '2' means there were changes, an exit code of '4' means there were
+  failures during the transaction, and an exit code of '6' means there were both
+  changes and failures.
 
 * --help:
   Print this help message
 
 * --logdest:
-  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'.
-
-  A path ending with '.json' will receive structured output in JSON format. The
-  log file will not have an ending ']' automatically written to it due to the
-  appending nature of logging. It must be appended manually to make the content
-  valid JSON.
+  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.
 
 * --verbose:
   Turn on verbose reporting.
@@ -173,13 +167,9 @@ Licensed under the Apache 2.0 License
       Puppet.err "No device found in #{Puppet[:deviceconfig]}"
       exit(1)
     end
-    returns = devices.collect do |devicename,device|
+    devices.each_value do |device|
       begin
-        device_url = URI.parse(device.url)
-        # Handle nil scheme & port
-        scheme = "#{device_url.scheme}://" if device_url.scheme
-        port = ":#{device_url.port}" if device_url.port
-        Puppet.info "starting applying configuration to #{device.name} at #{scheme}#{device_url.host}#{port}#{device_url.path}"
+        Puppet.info "starting applying configuration to #{device.name} at #{device.url}"
 
         # override local $vardir and $certname
         Puppet[:confdir] = ::File.join(Puppet[:devicedir], device.name)
@@ -202,8 +192,6 @@ Licensed under the Apache 2.0 License
         configurer.run(:network_device => true, :pluginsync => Puppet[:pluginsync])
       rescue => detail
         Puppet.log_exception(detail)
-        # If we rescued an error, then we return 1 as the exit code
-        1
       ensure
         Puppet[:vardir] = vardir
         Puppet[:confdir] = confdir
@@ -211,16 +199,6 @@ Licensed under the Apache 2.0 License
         Puppet::SSL::Host.reset
       end
     end
-    if ! returns or returns.compact.empty?
-      exit(1)
-    elsif options[:detailed_exitcodes]
-      # Bitwise OR the return codes together, puppet style
-      exit(returns.compact.reduce(:|))
-    elsif returns.include? 1
-      exit(1)
-    else
-      exit(0)
-    end
   end
 
   def setup_host
@@ -242,10 +220,6 @@ Licensed under the Apache 2.0 License
 
     Puppet.settings.use :main, :agent, :device, :ssl
 
-    # Always ignoreimport for agent. It really shouldn't even try to import,
-    # but this is just a temporary band-aid.
-    Puppet[:ignoreimport] = true
-
     # We need to specify a ca location for all of the SSL-related
     # indirected classes to work; in fingerprint mode we just need
     # access to the local files and we don't need a ca.