puppet 2.7.26 → 3.0.0.rc4

data/lib/puppet/application/agent.rb

@@ -2,11 +2,18 @@ require 'puppet/application'
 
 class Puppet::Application::Agent < Puppet::Application
 
-  should_parse_config
   run_mode :agent
 
   attr_accessor :args, :agent, :daemon, :host
 
+  def app_defaults
+    super.merge({
+      :catalog_terminus => :rest,
+      :node_terminus => :rest,
+      :facts_terminus => :facter,
+    })
+  end
+
   def preinit
     # Do an initial trap, so that cancels don't get a stack trace.
     Signal.trap(:INT) do
@@ -40,7 +47,12 @@ class Puppet::Application::Agent < Puppet::Application
   end
 
   option("--centrallogging")
-  option("--disable")
+
+  option("--disable [MESSAGE]") do |message|
+    options[:disable] = true
+    options[:disable_message] = message
+  end
+
   option("--enable")
   option("--debug","-d")
   option("--fqdn FQDN","-f")
@@ -50,14 +62,6 @@ class Puppet::Application::Agent < Puppet::Application
   option("--fingerprint")
   option("--digest DIGEST")
 
-  option("--serve HANDLER", "-s") do |arg|
-    if Puppet::Network::Handler.handler(arg)
-      options[:serve] << arg.to_sym
-    else
-      raise "Could not find handler for #{arg}"
-    end
-  end
-
   option("--no-client") do |arg|
     options[:client] = false
   end
@@ -71,8 +75,7 @@ class Puppet::Application::Agent < Puppet::Application
       Puppet::Util::Log.newdestination(arg)
       options[:setdest] = true
     rescue => detail
-      puts detail.backtrace if Puppet[:debug]
-      $stderr.puts detail.to_s
+      Puppet.log_exception(detail)
     end
   end
 
@@ -85,7 +88,7 @@ class Puppet::Application::Agent < Puppet::Application
   end
 
   def help
-    <<-'HELP'
+    <<-HELP
 
 puppet-agent(8) -- The puppet agent daemon
 ========
@@ -102,9 +105,9 @@ similar), or run interactively for testing purposes.
 USAGE
 -----
 puppet agent [--certname <name>] [-D|--daemonize|--no-daemonize]
-  [-d|--debug] [--detailed-exitcodes] [--digest <digest>] [--disable] [--enable]
+  [-d|--debug] [--detailed-exitcodes] [--digest <digest>] [--disable [message]] [--enable]
   [--fingerprint] [-h|--help] [-l|--logdest syslog|<file>|console]
-  [--no-client] [--noop] [-o|--onetime] [--serve <handler>] [-t|--test]
+  [--no-client] [--noop] [-o|--onetime] [-t|--test]
   [-v|--verbose] [-V|--version] [-w|--waitforcert <seconds>]
 
 
@@ -206,6 +209,9 @@ configuration options can also be generated by running puppet agent with
   not want the central configuration to override the local state until
   everything is tested and committed.
 
+  Disable can also take an optional message that will be reported by the
+  'puppet agent' at the next disabled run.
+
   'puppet agent' uses the same lock file while it is running, so no more
   than one 'puppet agent' process is working at a time.
 
@@ -248,15 +254,6 @@ configuration options can also be generated by running puppet agent with
   run. Useful for interactively running puppet agent when used in
   conjunction with the --no-daemonize option.
 
-* --serve:
-  Start another type of server. By default, 'puppet agent' will start a
-  service handler that allows authenticated and authorized remote nodes
-  to trigger the configuration to be pulled down and applied. You can
-  specify any handler here that does not require configuration, e.g.,
-  filebucket, ca, or resource. The handlers are in
-  'lib/puppet/network/handler', and the names must match exactly, both
-  in the call to 'serve' and in 'namespaceauth.conf'.
-
 * --test:
   Enable the most common options used for testing. These are 'onetime',
   'verbose', 'ignorecache', 'no-daemonize', 'no-usecacheonfailure',
@@ -336,18 +333,18 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
     @daemon.set_signal_traps
 
     begin
-      report = @agent.run
+      @agent.should_fork = false
+      exitstatus = @agent.run
     rescue => detail
-      puts detail.backtrace if Puppet[:trace]
-      Puppet.err detail.to_s
+      Puppet.log_exception(detail)
     end
 
     @daemon.stop(:exit => false)
 
-    if not report
+    if not exitstatus
       exit(1)
     elsif options[:detailed_exitcodes] then
-      exit(report.exit_status)
+      exit(exitstatus)
     else
       exit(0)
     end
@@ -375,7 +372,7 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
     if options[:enable]
       agent.enable
     elsif options[:disable]
-      agent.disable
+      agent.disable(options[:disable_message] || 'reason not specified')
     end
     exit(0)
   end
@@ -386,24 +383,16 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
       exit(14)
     end
 
-    handlers = nil
-
-    if options[:serve].empty?
-      handlers = [:Runner]
-    else
-      handlers = options[:serve]
-    end
-
     require 'puppet/network/server'
     # No REST handlers yet.
-    server = Puppet::Network::Server.new(:xmlrpc_handlers => handlers, :port => Puppet[:puppetport])
+    server = Puppet::Network::Server.new(:port => Puppet[:puppetport])
 
     @daemon.server = server
   end
 
   def setup_host
     @host = Puppet::SSL::Host.new
-    waitforcert = options[:waitforcert] || (Puppet[:onetime] ? 0 : 120)
+    waitforcert = options[:waitforcert] || (Puppet[:onetime] ? 0 : Puppet[:waitforcert])
     cert = @host.wait_for_cert(waitforcert) unless options[:fingerprint]
   end
 
@@ -471,13 +460,6 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
     # we want the last report to be persisted locally
     Puppet::Transaction::Report.indirection.cache_class = :yaml
 
-    # Override the default; puppetd needs this, usually.
-    # You can still override this on the command-line with, e.g., :compiler.
-    Puppet[:catalog_terminus] = :rest
-
-    # Override the default.
-    Puppet[:facts_terminus] = :facter
-
     Puppet::Resource::Catalog.indirection.cache_class = :yaml
 
     unless options[:fingerprint]

data/lib/puppet/application/apply.rb

@@ -1,9 +1,8 @@
 require 'puppet/application'
+require 'puppet/configurer'
 
 class Puppet::Application::Apply < Puppet::Application
 
-  should_parse_config
-
   option("--debug","-d")
   option("--execute EXECUTE","-e") do |arg|
     options[:code] = arg
@@ -13,14 +12,6 @@ class Puppet::Application::Apply < Puppet::Application
   option("--use-nodes")
   option("--detailed-exitcodes")
 
-  option("--apply catalog",  "-a catalog") do |arg|
-    Puppet.warning <<EOM
---apply is deprecated and will be removed in the future. Please
-use 'puppet apply --catalog <catalog>'.
-EOM
-    options[:catalog] = arg
-  end
-
   option("--catalog catalog",  "-c catalog") do |arg|
     options[:catalog] = arg
   end
@@ -40,7 +31,7 @@ EOM
   end
 
   def help
-    <<-'HELP'
+    <<-HELP
 
 puppet-apply(8) -- Apply Puppet manifests locally
 ========
@@ -53,8 +44,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>]
-  [--apply <catalog>] [--catalog <catalog>] <file>
+  [-e|--execute] [--detailed-exitcodes] [-l|--logdest <file>] [--noop]
+  [--catalog <catalog>] <file>
 
 
 DESCRIPTION
@@ -76,7 +67,7 @@ manifests.
 OPTIONS
 -------
 Note that any configuration parameter that's valid in the configuration
-file is also a valid long argument. For example, 'modulepath' is a
+file is also a valid long argument. For example, 'tags' is a
 valid configuration parameter, so you can specify '--tags <class>,<tag>'
 as an argument.
 
@@ -107,17 +98,17 @@ configuration options can also be generated by running puppet with
   Where to send messages. Choose between syslog, the console, and a log
   file. Defaults to sending messages to the console.
 
+* --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
+  executing the changes.
+
 * --execute:
   Execute a specific piece of Puppet code
 
 * --verbose:
   Print extra information.
 
-* --apply:
-  Apply a JSON catalog (such as one generated with 'puppet master --compile'). You can
-  either specify a JSON file or pipe in JSON from standard input. Deprecated, please
-  use --catalog instead.
-
 * --catalog:
   Apply a JSON catalog (such as one generated with 'puppet master --compile'). You can
   either specify a JSON file or pipe in JSON from standard input.
@@ -142,6 +133,12 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
     HELP
   end
 
+  def app_defaults
+    super.merge({
+      :default_file_terminus => "file_server",
+    })
+  end
+
   def run_command
     if options[:catalog]
       apply
@@ -156,19 +153,8 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
     else
       text = ::File.read(options[:catalog])
     end
-
-    begin
-      catalog = Puppet::Resource::Catalog.convert_from(Puppet::Resource::Catalog.default_format,text)
-      catalog = Puppet::Resource::Catalog.pson_create(catalog) unless catalog.is_a?(Puppet::Resource::Catalog)
-    rescue => detail
-      raise Puppet::Error, "Could not deserialize catalog from pson: #{detail}"
-    end
-
-    catalog = catalog.to_ral
-
-    require 'puppet/configurer'
-    configurer = Puppet::Configurer.new
-    configurer.run :catalog => catalog
+    catalog = read_catalog(text)
+    apply_catalog(catalog)
   end
 
   def main
@@ -224,20 +210,17 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
 
       catalog.retrieval_duration = Time.now - starttime
 
-      require 'puppet/configurer'
-      configurer = Puppet::Configurer.new
-      report = configurer.run(:skip_plugin_download => true, :catalog => catalog)
+      exit_status = apply_catalog(catalog)
 
-      if not report
+      if not exit_status
         exit(1)
       elsif options[:detailed_exitcodes] then
-        exit(report.exit_status)
+        exit(exit_status)
       else
         exit(0)
       end
     rescue => detail
-      puts detail.backtrace if Puppet[:trace]
-      $stderr.puts detail.message
+      Puppet.log_exception(detail)
       exit(1)
     end
   end
@@ -263,4 +246,22 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
       Puppet::Util::Log.level = :info
     end
   end
+
+  private
+
+  def read_catalog(text)
+    begin
+      catalog = Puppet::Resource::Catalog.convert_from(Puppet::Resource::Catalog.default_format,text)
+      catalog = Puppet::Resource::Catalog.pson_create(catalog) unless catalog.is_a?(Puppet::Resource::Catalog)
+    rescue => detail
+      raise Puppet::Error, "Could not deserialize catalog from pson: #{detail}"
+    end
+
+    catalog.to_ral
+  end
+
+  def apply_catalog(catalog)
+    configurer = Puppet::Configurer.new
+    configurer.run(:catalog => catalog, :pluginsync => false)
+  end
 end

data/lib/puppet/application/cert.rb

@@ -2,7 +2,6 @@ require 'puppet/application'
 
 class Puppet::Application::Cert < Puppet::Application
 
-  should_parse_config
   run_mode :master
 
   attr_accessor :all, :ca, :digest, :signed
@@ -53,7 +52,7 @@ class Puppet::Application::Cert < Puppet::Application
   end
 
   def help
-    <<-'HELP'
+    <<-HELP
 
 puppet-cert(8) -- Manage certificates and requests
 ========
@@ -109,10 +108,11 @@ unless the '--all' option is set.
   Print the full-text version of a host's certificate.
 
 * revoke:
-  Revoke the certificate of a client. The certificate can be specified either
-  by its serial number (given as a hexadecimal number prefixed by '0x') or by its
-  hostname. The certificate is revoked by adding it to the Certificate Revocation
-  List given by the 'cacrl' configuration option. Note that the puppet master
+  Revoke the certificate of a client. The certificate can be specified
+  either by its serial number (given as a decimal number or a
+  hexadecimal number prefixed by '0x') or by its hostname. The
+  certificate is revoked by adding it to the Certificate Revocation List
+  given by the 'cacrl' configuration option. Note that the puppet master
   needs to be restarted after revoking certificates.
 
 * sign:
@@ -188,8 +188,7 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
       @ca.apply(:revoke, options.merge(:to => hosts)) if subcommand == :destroy
       @ca.apply(subcommand, options.merge(:to => hosts, :digest => @digest))
     rescue => detail
-      puts detail.backtrace if Puppet[:trace]
-      puts detail.to_s
+      Puppet.log_exception(detail)
       exit(24)
     end
   end
@@ -210,7 +209,7 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
     # the data.  This will do the right thing for non-local certificates, in
     # that the command line but *NOT* the config file option will apply.
     if subcommand == :generate
-      if Puppet.settings.setting(:dns_alt_names).setbycli
+      if Puppet.settings.set_by_cli?(:dns_alt_names)
         options[:dns_alt_names] = Puppet[:dns_alt_names]
       end
     end
@@ -218,8 +217,7 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
     begin
       @ca = Puppet::SSL::CertificateAuthority.new
     rescue => detail
-      puts detail.backtrace if Puppet[:trace]
-      puts detail.to_s
+      Puppet.log_exception(detail)
       exit(23)
     end
   end

data/lib/puppet/application/certificate.rb

@@ -4,8 +4,13 @@ class Puppet::Application::Certificate < Puppet::Application::IndirectionBase
   def setup
     location = Puppet::SSL::Host.ca_location
     if location == :local && !Puppet::SSL::CertificateAuthority.ca?
-      self.class.run_mode("master")
-      self.set_run_mode self.class.run_mode
+      # I'd prefer if this could be dealt with differently; ideally, run_mode should be set as
+      #  part of a class definition, and should not be modifiable beyond that.  This is one of
+      #  the cases where that isn't currently possible.
+      # Perhaps a separate issue, but related, is that the run_mode probably shouldn't be a
+      #  normal 'setting' like the rest of the config stuff; I left some notes in settings.rb
+      #  and defaults.rb discussing this.  --cprice 2012-03-22
+      Puppet.settings.set_value(:run_mode, :master, :application_defaults)
     end
 
     super

data/lib/puppet/application/certificate_request.rb

@@ -1,4 +1,7 @@
 require 'puppet/application/indirection_base'
 
+# NOTE: this is using an "old" naming convention (underscores instead of camel-case), for backwards
+#  compatibility with 2.7.x.  When the old naming convention is officially and publicly deprecated,
+#  this should be changed to camel-case.
 class Puppet::Application::Certificate_request < Puppet::Application::IndirectionBase
 end

data/lib/puppet/application/certificate_revocation_list.rb

@@ -1,4 +1,7 @@
 require 'puppet/application/indirection_base'
 
+# NOTE: this is using an "old" naming convention (underscores instead of camel-case), for backwards
+#  compatibility with 2.7.x.  When the old naming convention is officially and publicly deprecated,
+#  this should be changed to camel-case.
 class Puppet::Application::Certificate_revocation_list < Puppet::Application::IndirectionBase
 end

data/lib/puppet/application/describe.rb

@@ -170,8 +170,6 @@ end
 class Puppet::Application::Describe < Puppet::Application
   banner "puppet describe [options] [type]"
 
-  should_not_parse_config
-
   option("--short", "-s", "Only list parameters without detail") do |arg|
     options[:parameters] = false
   end
@@ -181,7 +179,7 @@ class Puppet::Application::Describe < Puppet::Application
   option("--meta","-m")
 
   def help
-    <<-'HELP'
+    <<-HELP
 
 puppet-describe(8) -- Display help about resource types
 ========

data/lib/puppet/application/device.rb

@@ -4,11 +4,18 @@ require 'puppet/util/network_device'
 
 class Puppet::Application::Device < Puppet::Application
 
-  should_parse_config
   run_mode :agent
 
   attr_accessor :args, :agent, :host
 
+  def app_defaults
+    super.merge({
+      :catalog_terminus => :rest,
+      :node_terminus => :rest,
+      :facts_terminus => :network_device,
+    })
+  end
+
   def preinit
     # Do an initial trap, so that cancels don't get a stack trace.
     Signal.trap(:INT) do
@@ -43,8 +50,7 @@ class Puppet::Application::Device < Puppet::Application
       Puppet::Util::Log.newdestination(arg)
       options[:setdest] = true
     rescue => detail
-      puts detail.backtrace if Puppet[:debug]
-      $stderr.puts detail.to_s
+      Puppet.log_exception(detail)
     end
   end
 
@@ -57,7 +63,7 @@ class Puppet::Application::Device < Puppet::Application
   end
 
     def help
-      <<-'HELP'
+      <<-HELP
 
 puppet-device(8) -- Manage remote network devices
 ========
@@ -78,7 +84,7 @@ USAGE
 
 DESCRIPTION
 -----------
-Once the client has a signed certificate for a given remote device, it will 
+Once the client has a signed certificate for a given remote device, it will
 retrieve its configuration and apply it.
 
 USAGE NOTES
@@ -148,7 +154,7 @@ Brice Figureau
 
 COPYRIGHT
 ---------
-Copyright (c) 2011 Puppet Labs, LLC 
+Copyright (c) 2011 Puppet Labs, LLC
 Licensed under the Apache 2.0 License
       HELP
     end
@@ -188,10 +194,9 @@ Licensed under the Apache 2.0 License
 
         require 'puppet/configurer'
         configurer = Puppet::Configurer.new
-        report = configurer.run(:network_device => true)
+        report = configurer.run(:network_device => true, :pluginsync => Puppet[:pluginsync])
       rescue => detail
-        puts detail.backtrace if Puppet[:trace]
-        Puppet.err detail.to_s
+        Puppet.log_exception(detail)
       ensure
         Puppet.settings.set_value(:vardir, vardir, :cli)
         Puppet.settings.set_value(:confdir, confdir, :cli)
@@ -203,7 +208,7 @@ Licensed under the Apache 2.0 License
 
   def setup_host
     @host = Puppet::SSL::Host.new
-    waitforcert = options[:waitforcert] || (Puppet[:onetime] ? 0 : 120)
+    waitforcert = options[:waitforcert] || (Puppet[:onetime] ? 0 : Puppet[:waitforcert])
     cert = @host.wait_for_cert(waitforcert)
   end
 
@@ -231,12 +236,6 @@ Licensed under the Apache 2.0 License
 
     Puppet::Transaction::Report.indirection.terminus_class = :rest
 
-    # Override the default; puppetd needs this, usually.
-    # You can still override this on the command-line with, e.g., :compiler.
-    Puppet[:catalog_terminus] = :rest
-
-    Puppet[:facts_terminus] = :network_device
-
     Puppet::Resource::Catalog.indirection.cache_class = :yaml
   end
 end