puppet 3.8.7 → 4.0.0

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>
@@ -124,14 +124,9 @@ parameter, so you can specify '--server <servername>' as an argument.
   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.
@@ -242,10 +237,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.

data/lib/puppet/application/doc.rb

@@ -51,93 +51,51 @@ class Puppet::Application::Doc < Puppet::Application
   def help
     <<-'HELP'
 
-puppet-doc(8) -- Generate Puppet documentation and references
+puppet-doc(8) -- Generate Puppet references
 ========
 
 SYNOPSIS
 --------
 Generates a reference for all Puppet types. Largely meant for internal
-Puppet Labs use.
+Puppet Labs use. (Deprecated)
 
 
 USAGE
 -----
-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>]
+puppet doc [-h|--help] [-l|--list]
+  [-r|--reference <reference-name>]
 
 
 DESCRIPTION
 -----------
-If mode is not 'rdoc', then this command generates a Markdown document
+This deprecated command generates a Markdown document to stdout
 describing all installed Puppet types or all allowable arguments to
 puppet executables. It is largely meant for internal use and is used to
 generate the reference document available on the Puppet Labs web site.
 
-In 'rdoc' mode, this command generates an html RDoc hierarchy describing
-the manifests that are in 'manifestdir' and 'modulepath' configuration
-directives. The generated documentation directory is doc by default but
-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.
+For Puppet module documentation (and all other use cases) this command
+has been superseded by the "puppet-strings"
+module - see https://github.com/puppetlabs/puppetlabs-strings for more information.
 
+This command (puppet-doc) will be removed once the
+puppetlabs internal documentation processing pipeline is completely based
+on puppet-strings.
 
 OPTIONS
 -------
-* --all:
-  Output the docs for all of the reference types. In 'rdoc' mode, this also
-  outputs documentation for all resources.
 
 * --help:
   Print this help message
 
-* --outputdir:
-  Used only in 'rdoc' mode. The directory to which the rdoc output should
-  be written.
-
-* --mode:
-  Determine the output mode. Valid modes are 'text', 'pdf' and 'rdoc'. The 'pdf'
-  mode creates PDF formatted files in the /tmp directory. The default mode is
-  'text'.
-
 * --reference:
   Build a particular reference. Get a list of references by running
   'puppet doc --list'.
 
-* --charset:
-  Used only in 'rdoc' mode. It sets the charset used in the html files produced.
-
-* --manifestdir:
-  Used only in 'rdoc' mode. The directory to scan for stand-alone manifests.
-  If not supplied, puppet doc will use the manifestdir from puppet.conf.
-
-* --modulepath:
-  Used only in 'rdoc' mode. The directory or directories to scan for modules.
-  If not supplied, puppet doc will use the modulepath from puppet.conf.
-
-* --environment:
-  Used only in 'rdoc' mode. The configuration environment from which
-  to read the modulepath and manifestdir settings, when reading said settings
-  from puppet.conf.
-
 
 EXAMPLE
 -------
     $ puppet doc -r type > /tmp/type_reference.markdown
 
-or
-
-    $ puppet doc --outputdir /tmp/rdoc --mode rdoc /path/to/manifests
-
-or
-
-    $ puppet doc /etc/puppet/manifests/site.pp
-
-or
-
-    $ puppet doc -m pdf -r configuration
-
 
 AUTHOR
 ------
@@ -244,13 +202,13 @@ HELP
     options[:references] << :type if options[:references].empty?
   end
 
-  def setup_rdoc(dummy_argument=:work_arround_for_ruby_GC_bug)
+  def setup_rdoc
     # consume the unknown options
     # and feed them as settings
     if @unknown_args.size > 0
       @unknown_args.each do |option|
         # force absolute path for modulepath when passed on commandline
-        if option[:opt]=="--modulepath" or option[:opt] == "--manifestdir"
+        if option[:opt]=="--modulepath"
           option[:arg] = option[:arg].split(::File::PATH_SEPARATOR).collect { |p| ::File.expand_path(p) }.join(::File::PATH_SEPARATOR)
         end
         Puppet.settings.handlearg(option[:opt], option[:arg])
@@ -259,14 +217,9 @@ HELP
   end
 
   def setup_logging
-  # Handle the logging settings.
-    if options[:debug]
-      Puppet::Util::Log.level = :debug
-    elsif options[:verbose]
-      Puppet::Util::Log.level = :info
-    else
-      Puppet::Util::Log.level = :warning
-    end
+    Puppet::Util::Log.level = :warning
+
+    set_log_level
 
     Puppet::Util::Log.newdestination(:console)
   end

data/lib/puppet/application/epp.rb

@@ -0,0 +1,5 @@
+require 'puppet/application/face_base'
+require 'puppet/face'
+
+class Puppet::Application::Epp < Puppet::Application::FaceBase
+end

data/lib/puppet/application/face_base.rb

@@ -5,17 +5,28 @@ require 'pp'
 
 class Puppet::Application::FaceBase < Puppet::Application
   option("--debug", "-d") do |arg|
-    Puppet::Util::Log.level = :debug
+    set_log_level(:debug => true)
   end
 
   option("--verbose", "-v") do |_|
-    Puppet::Util::Log.level = :info
+    set_log_level(:verbose => true)
   end
 
   option("--render-as FORMAT") do |format|
     self.render_as = format.to_sym
   end
 
+  option("--help", "-h") do |arg|
+    if action && !@is_default_action
+      # Only invoke help on the action if it was specified, not if
+      # it was the default action.
+      puts Puppet::Face[:help, :current].help(face.name, action.name)
+    else
+      puts Puppet::Face[:help, :current].help(face.name)
+    end
+    exit
+  end
+
   attr_accessor :face, :action, :type, :arguments, :render_as
 
   def render_as=(format)
@@ -108,6 +119,14 @@ class Puppet::Application::FaceBase < Puppet::Application
       if @action = @face.get_default_action() then
         @is_default_action = true
       else
+        # First try to handle global command line options
+        # But ignoring invalid options as this is a invalid action, and
+        # we want the error message for that instead.
+        begin
+          super
+        rescue OptionParser::InvalidOption
+        end
+
         face   = @face.name
         action = action_name.nil? ? 'default' : "'#{action_name}'"
         msg = "'#{face}' has no #{action} action.  See `puppet help #{face}`."
@@ -121,9 +140,9 @@ class Puppet::Application::FaceBase < Puppet::Application
 
     # Now we can interact with the default option code to build behaviour
     # around the full set of options we now know we support.
-    @action.options.each do |option|
-      option = @action.get_option(option) # make it the object.
-      self.class.option(*option.optparse) # ...and make the CLI parse it.
+    @action.options.each do |o|
+      o = @action.get_option(o) # make it the object.
+      self.class.option(*o.optparse) # ...and make the CLI parse it.
     end
 
     # ...and invoke our parent to parse all the command line options.

data/lib/puppet/application/master.rb

@@ -86,11 +86,6 @@ generated by running puppet master with '--genconfig'.
   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.
-
 * --masterport:
   The port on which to listen for traffic.
   (This is a Puppet setting, and can go in puppet.conf.)
@@ -245,6 +240,8 @@ Copyright (c) 2012 Puppet Labs, LLC Licensed under the Apache 2.0 License
     else
       Puppet::SSL::Host.ca_location = :none
     end
+    Puppet::SSL::Oids.register_puppet_oids
+    Puppet::SSL::Oids.load_custom_oid_file(Puppet[:trusted_oid_mapping_file])
   end
 
   # Sets up a special node cache "write only yaml" that collects and stores node data in yaml

data/lib/puppet/application/resource.rb

@@ -11,11 +11,7 @@ class Puppet::Application::Resource < Puppet::Application
   option("--debug","-d")
   option("--verbose","-v")
   option("--edit","-e")
-
-  option("--host HOST","-H") do |arg|
-    Puppet.warning("Accessing resources on the network is deprecated. See http://links.puppetlabs.com/deprecate-networked-resource")
-    @host = arg
-  end
+  option("--to_yaml","-y")
 
   option("--types", "-t") do |arg|
     types = []
@@ -46,7 +42,7 @@ Uses the Puppet RAL to directly interact with the system.
 USAGE
 -----
 puppet resource [-h|--help] [-d|--debug] [-v|--verbose] [-e|--edit]
-  [-H|--host <host>] [-p|--param <parameter>] [-t|--types] <type>
+  [-p|--param <parameter>] [-t|--types] [-y|--to_yaml] <type>
   [<name>] [<attribute>=<value> ...]
 
 
@@ -104,6 +100,8 @@ configuration options can also be generated by running puppet with
 * --verbose:
   Print extra information.
 
+* --to_yaml:
+  Output found resources in yaml format, suitable to use with Hiera and create_resources.
 
 EXAMPLE
 -------
@@ -137,12 +135,20 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
   def main
     type, name, params = parse_args(command_line.args)
 
-    raise "You cannot edit a remote host" if options[:edit] and @host
+    raise "Editing with Yaml output is not supported" if options[:edit] and options[:to_yaml]
 
     resources = find_or_save_resources(type, name, params)
-    text = resources.
-      map { |resource| resource.prune_parameters(:parameters_to_include => @extra_params).to_manifest }.
-      join("\n")
+
+    if options[:to_yaml]
+      text = resources.
+        map { |resource| resource.prune_parameters(:parameters_to_include => @extra_params).to_hierayaml }.
+        join("\n")
+      text.prepend("#{type.downcase}:\n")
+    else
+      text = resources.
+        map { |resource| resource.prune_parameters(:parameters_to_include => @extra_params).to_manifest }.
+        join("\n")
+    end
 
     options[:edit] ?
       handle_editing(text) :
@@ -156,12 +162,6 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
 
   private
 
-  def remote_key(type, name)
-    Puppet::Resource.indirection.terminus_class = :rest
-    port = Puppet[:puppetport]
-    ["https://#{@host}:#{port}", "production", "resources", type, name].join('/')
-  end
-
   def local_key(type, name)
     [type, name].join('/')
   end
@@ -206,7 +206,7 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
   end
 
   def find_or_save_resources(type, name, params)
-    key = @host ? remote_key(type, name) : local_key(type, name)
+    key = local_key(type, name)
 
     if name
       if params.empty?