puppet 4.10.12-x86-mingw32 → 5.0.0-x86-mingw32

data/lib/puppet/application/apply.rb

@@ -46,7 +46,7 @@ USAGE
 -----
 puppet apply [-h|--help] [-V|--version] [-d|--debug] [-v|--verbose]
   [-e|--execute] [--detailed-exitcodes] [-L|--loadclasses]
-  [-l|--logdest syslog|eventlog|<ABS FILEPATH>|console] [--noop]
+  [-l|--logdest syslog|eventlog|<FILE>|console] [--noop]
   [--catalog <catalog>] [--write-catalog-summary] <file>
 
 
@@ -177,8 +177,11 @@ Copyright (c) 2011 Puppet Inc., LLC Licensed under the Apache 2.0 License
     else
       text = Puppet::FileSystem.read(options[:catalog], :encoding => 'utf-8')
     end
-    catalog = read_catalog(text)
-    apply_catalog(catalog)
+    env = Puppet.lookup(:environments).get(Puppet[:environment])
+    Puppet.override(:current_environment => env, :loaders => Puppet::Pops::Loaders.new(env)) do
+      catalog = read_catalog(text)
+      apply_catalog(catalog)
+    end
   end
 
   def main
@@ -187,8 +190,8 @@ Copyright (c) 2011 Puppet Inc., LLC Licensed under the Apache 2.0 License
       Puppet[:code] = options[:code] || STDIN.read
     else
       manifest = command_line.args.shift
-      raise "Could not find file #{manifest}" unless Puppet::FileSystem.exist?(manifest)
-      Puppet.warning("Only one file can be applied per run.  Skipping #{command_line.args.join(', ')}") if command_line.args.size > 0
+      raise _("Could not find file %{manifest}") % { manifest: manifest } unless Puppet::FileSystem.exist?(manifest)
+      Puppet.warning(_("Only one file can be applied per run.  Skipping %{files}") % { files: command_line.args.join(', ') }) if command_line.args.size > 0
     end
 
     # splay if needed
@@ -197,7 +200,7 @@ Copyright (c) 2011 Puppet Inc., LLC Licensed under the Apache 2.0 License
     unless Puppet[:node_name_fact].empty?
       # Collect our facts.
       unless facts = Puppet::Node::Facts.indirection.find(Puppet[:node_name_value])
-        raise "Could not find facts for #{Puppet[:node_name_value]}"
+        raise _("Could not find facts for %{node}") % { node: Puppet[:node_name_value] }
       end
 
       Puppet[:node_name_value] = facts.values[Puppet[:node_name_fact]]
@@ -206,7 +209,7 @@ Copyright (c) 2011 Puppet Inc., LLC Licensed under the Apache 2.0 License
 
     # Find our Node
     unless node = Puppet::Node.indirection.find(Puppet[:node_name_value])
-      raise "Could not find node #{Puppet[:node_name_value]}"
+      raise _("Could not find node %{node}") % { node: Puppet[:node_name_value] }
     end
 
     configured_environment = node.environment || Puppet.lookup(:current_environment)
@@ -222,21 +225,20 @@ Copyright (c) 2011 Puppet Inc., LLC Licensed under the Apache 2.0 License
     # the :manifest setting of the apply_environment.
     node.environment = apply_environment
 
-    Puppet.override({:current_environment => apply_environment}, "For puppet apply") do
+    #TRANSLATORS "puppet apply" is a program command and should not be translated
+    Puppet.override({:current_environment => apply_environment}, _("For puppet apply")) do
       # Merge in the facts.
       node.merge(facts.values) if facts
 
       # Add server facts so $server_facts[environment] exists when doing a puppet apply
-      if Puppet[:trusted_server_facts]
-        node.add_server_facts({})
-      end
+      node.add_server_facts({})
 
       # Allow users to load the classes that puppet agent creates.
       if options[:loadclasses]
         file = Puppet[:classfile]
         if Puppet::FileSystem.exist?(file)
           unless FileTest.readable?(file)
-            $stderr.puts "#{file} is not readable"
+            $stderr.puts _("%{file} is not readable") % { file: file }
             exit(63)
           end
           node.classes = Puppet::FileSystem.read(file, :encoding => 'utf-8').split(/[\s\n]+/)
@@ -271,7 +273,7 @@ Copyright (c) 2011 Puppet Inc., LLC Licensed under the Apache 2.0 License
           catalog.write_resource_file
         end
 
-        exit_status = apply_catalog(catalog)
+        exit_status = Puppet.override(:loaders => Puppet::Pops::Loaders.new(apply_environment)) { apply_catalog(catalog) }
 
         if not exit_status
           exit(1)
@@ -309,14 +311,16 @@ Copyright (c) 2011 Puppet Inc., LLC Licensed under the Apache 2.0 License
     Puppet::Util::Log.newdestination(:console) unless options[:setdest]
 
     Signal.trap(:INT) do
-      $stderr.puts "Exiting"
+      $stderr.puts _("Exiting")
       exit(1)
     end
 
     Puppet.settings.use :main, :agent, :ssl
 
 
-    if Puppet[:catalog_cache_terminus]
+    if Puppet[:noop]
+      Puppet::Resource::Catalog.indirection.cache_class = nil
+    elsif Puppet[:catalog_cache_terminus]
       Puppet::Resource::Catalog.indirection.cache_class = Puppet[:catalog_cache_terminus]
     end
 
@@ -333,11 +337,11 @@ Copyright (c) 2011 Puppet Inc., LLC Licensed under the Apache 2.0 License
   private
 
   def read_catalog(text)
+    format = Puppet::Resource::Catalog.default_format
     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)
+      catalog = Puppet::Resource::Catalog.convert_from(format, text)
     rescue => detail
-      raise Puppet::Error, "Could not deserialize catalog from pson: #{detail}", detail.backtrace
+      raise Puppet::Error, _("Could not deserialize catalog from %{format}: %{detail}") % { format: format, detail: detail }, detail.backtrace
     end
 
     catalog.to_ral

data/lib/puppet/application/cert.rb

@@ -264,12 +264,7 @@ Copyright (c) 2011 Puppet Inc., LLC Licensed under the Apache 2.0 License
       hosts = command_line.args.collect { |h| h.downcase }
     end
     begin
-      if subcommand == :destroy
-        raise _("Refusing to destroy all certs, provide an explicit list of certs to destroy") if hosts == :all
-
-        signed_hosts = hosts - @ca.waiting?
-        apply(@ca, :revoke, options.merge(:to => signed_hosts)) unless signed_hosts.empty?
-      end
+      apply(@ca, :revoke, options.merge(:to => hosts)) if subcommand == :destroy
       apply(@ca, subcommand, options.merge(:to => hosts, :digest => @digest))
     rescue => detail
       Puppet.log_exception(detail)
@@ -327,7 +322,7 @@ Copyright (c) 2011 Puppet Inc., LLC Licensed under the Apache 2.0 License
   # Create and run an applicator.  I wanted to build an interface where you could do
   # something like 'ca.apply(:generate).to(:all) but I don't think it's really possible.
   def apply(ca, method, options)
-    raise ArgumentError, "You must specify the hosts to apply to; valid values are an array or the symbol :all" unless options[:to]
+    raise ArgumentError, _("You must specify the hosts to apply to; valid values are an array or the symbol :all") unless options[:to]
     applier = Puppet::SSL::CertificateAuthority::Interface.new(method, options)
     applier.apply(ca)
   end

data/lib/puppet/application/config.rb

@@ -1,5 +1,4 @@
 require 'puppet/application/face_base'
 
 class Puppet::Application::Config < Puppet::Application::FaceBase
-  environment_mode :not_required
 end

data/lib/puppet/application/describe.rb

@@ -11,7 +11,7 @@ class Formatter
     work = (opts[:scrub] ? scrub(txt) : txt)
     indent = (opts[:indent] ? opts[:indent] : 0)
     textLen = @width - indent
-    patt = Regexp.new("^(.{0,#{textLen}})[ \n]")
+    patt = Regexp.new("\\A(.{0,#{textLen}})[ \n]")
     prefix = " " * indent
 
     res = []

data/lib/puppet/application/device.rb

@@ -19,7 +19,7 @@ class Puppet::Application::Device < Puppet::Application
   def preinit
     # Do an initial trap, so that cancels don't get a stack trace.
     Signal.trap(:INT) do
-      $stderr.puts "Cancelling startup"
+      $stderr.puts _("Cancelling startup")
       exit(0)
     end
 
@@ -30,6 +30,7 @@ class Puppet::Application::Device < Puppet::Application
       :debug => false,
       :centrallogs => false,
       :setdest => false,
+      :target => nil,
     }.each do |opt,val|
       options[opt] = val
     end
@@ -57,6 +58,10 @@ class Puppet::Application::Device < Puppet::Application
     @args[:Port] = arg
   end
 
+  option("--target DEVICE", "-t") do |arg|
+    options[:target] = arg.to_s
+  end
+
     def help
       <<-'HELP'
 
@@ -65,54 +70,51 @@ puppet-device(8) -- Manage remote network devices
 
 SYNOPSIS
 --------
-Retrieves catalogs from the Puppet master and applies them to remote devices. 
-
-This subcommand can be run manually; or periodically using cron,
-a scheduled task, or a similar tool.
+Retrieves all configurations from the puppet master and apply
+them to the remote devices configured in /etc/puppetlabs/puppet/device.conf.
 
+Currently must be run out periodically, using cron or something similar.
 
 USAGE
 -----
-  puppet device [-d|--debug] [--detailed-exitcodes]
+  puppet device [-d|--debug] [--detailed-exitcodes] [--deviceconfig <file>]
                 [-h|--help] [-l|--logdest syslog|<file>|console]
                 [-v|--verbose] [-w|--waitforcert <seconds>]
-                [--user=<user>] [-V|--version]
+                [-t|--target <device>] [-V|--version]
 
 
 DESCRIPTION
 -----------
-Devices require a proxy Puppet agent to request certificates, collect facts,
-retrieve and apply catalogs, and store reports.
-
+Once the client has a signed certificate for a given remote device, it will
+retrieve its configuration and apply it.
 
 USAGE NOTES
 -----------
-Devices managed by the puppet-device subcommand on a Puppet agent are 
-configured in device.conf, which is located at $confdir/device.conf by default, 
-and is configurable with the $deviceconfig setting. 
-
-The device.conf file is an INI-like file, with one section per device:
-
-[<DEVICE_CERTNAME>]
-type <TYPE>
-url <URL>
-debug
-
-The section name specifies the certname of the device. 
+One need a /etc/puppetlabs/puppet/device.conf file with the following content:
 
-The values for the type and url properties are specific to each type of device.
+[remote.device.fqdn]
+type <type>
+url <url>
 
-The optional debug property specifies transport-level debugging,
-and is limited to telnet and ssh transports.
+where:
+ * type: the current device type (the only value at this time is cisco)
+ * url: an url allowing to connect to the device
 
-See https://docs.puppet.com/puppet/latest/config_file_device.html for details.
+Supported url must conforms to:
+ scheme://user:password@hostname/?query
 
+ with:
+  * scheme: either ssh or telnet
+  * user: username, can be omitted depending on the switch/router configuration
+  * password: the connection password
+  * query: this is device specific. Cisco devices supports an enable parameter whose
+  value would be the enable password.
 
 OPTIONS
 -------
-Note that any setting that's valid in the configuration file is also a valid 
-long argument. For example, 'server' is a valid configuration parameter, so 
-you can specify '--server <servername>' as an argument.
+Note that any setting that's valid in the configuration file
+is also a valid long argument.  For example, 'server' is a valid configuration
+parameter, so you can specify '--server <servername>' as an argument.
 
 * --debug:
   Enable full debugging.
@@ -124,6 +126,10 @@ you can specify '--server <servername>' as an argument.
   means at least one device had resource failures. Exit codes of '3', '5', '6',
   or '7' means that a bitwise combination of the preceding exit codes happened.
 
+* --deviceconfig:
+  Path to the device config file for puppet device.
+  Default: $confdir/device.conf
+
 * --help:
   Print this help message
 
@@ -137,8 +143,9 @@ you can specify '--server <servername>' as an argument.
   appending nature of logging. It must be appended manually to make the content
   valid JSON.
 
-* --user:
-  The user to run as.
+* --target:
+  Target a specific device/certificate in the device.conf. Doing so will perform a
+  device run against only that device/certificate.
 
 * --verbose:
   Turn on verbose reporting.
@@ -148,8 +155,8 @@ you can specify '--server <servername>' as an argument.
   and it is enabled by default, with a value of 120 (seconds).  This causes
   +puppet agent+ to connect to the server every 2 minutes and ask it to sign a
   certificate request.  This is useful for the initial setup of a puppet
-  client.  You can turn off waiting for certificates by specifying a time of 0.
-
+  client.  You can turn off waiting for certificates by specifying a time
+  of 0.
 
 EXAMPLE
 -------
@@ -173,51 +180,62 @@ Licensed under the Apache 2.0 License
     confdir = Puppet[:confdir]
     certname = Puppet[:certname]
 
-    # find device list
-    require 'puppet/util/network_device/config'
-    devices = Puppet::Util::NetworkDevice::Config.devices
-    if devices.empty?
-      Puppet.err "No device found in #{Puppet[:deviceconfig]}"
-      exit(1)
-    end
-    returns = devices.collect do |devicename,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}"
-
-        # override local $vardir and $certname
-        Puppet[:confdir] = ::File.join(Puppet[:devicedir], device.name)
-        Puppet[:vardir] = ::File.join(Puppet[:devicedir], device.name)
-        Puppet[:certname] = device.name
-
-        # this will reload and recompute default settings and create the devices sub vardir, or we hope so :-)
-        Puppet.settings.use :main, :agent, :ssl
-
-        # this init the device singleton, so that the facts terminus
-        # and the various network_device provider can use it
-        Puppet::Util::NetworkDevice.init(device)
-
-        # ask for a ssl cert if needed, but at least
-        # setup the ssl system for this device.
-        setup_host
-
-        require 'puppet/configurer'
-        configurer = Puppet::Configurer.new
-        configurer.run(:network_device => true, :pluginsync => Puppet::Configurer.should_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
-        Puppet[:certname] = certname
-        Puppet::SSL::Host.reset
+    env = Puppet.lookup(:environments).get(Puppet[:environment])
+    returns = Puppet.override(:current_environment => env, :loaders => Puppet::Pops::Loaders.new(env)) do
+      # find device list
+      require 'puppet/util/network_device/config'
+      devices = Puppet::Util::NetworkDevice::Config.devices.dup
+      if options[:target]
+        devices.select! { |key, value| key == options[:target] }
+      end
+      if devices.empty?
+        if options[:target]
+          Puppet.err _("Target device / certificate '%{target}' not found in %{config}") % { target: options[:target], config: Puppet[:deviceconfig] }
+        else
+          Puppet.err _("No device found in %{config}") % { config: Puppet[:deviceconfig] }
+          exit(1)
+        end
+      end
+      devices.collect do |devicename,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 %{target} at %{scheme}%{url_host}%{port}%{url_path}") % { target: device.name, scheme: scheme, url_host: device_url.host, port: port, url_path: device_url.path }
+
+          # override local $vardir and $certname
+          Puppet[:confdir] = ::File.join(Puppet[:devicedir], device.name)
+          Puppet[:vardir] = ::File.join(Puppet[:devicedir], device.name)
+          Puppet[:certname] = device.name
+
+          # this will reload and recompute default settings and create the devices sub vardir, or we hope so :-)
+          Puppet.settings.use :main, :agent, :ssl
+
+          # this init the device singleton, so that the facts terminus
+          # and the various network_device provider can use it
+          Puppet::Util::NetworkDevice.init(device)
+
+          # ask for a ssl cert if needed, but at least
+          # setup the ssl system for this device.
+          setup_host
+
+          require 'puppet/configurer'
+          configurer = Puppet::Configurer.new
+          configurer.run(:network_device => true, :pluginsync => Puppet::Configurer.should_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
+          Puppet[:certname] = certname
+          Puppet::SSL::Host.reset
+        end
       end
     end
+
     if ! returns or returns.compact.empty?
       exit(1)
     elsif options[:detailed_exitcodes]

data/lib/puppet/application/doc.rb

@@ -25,7 +25,7 @@ class Puppet::Application::Doc < Puppet::Application
     if Puppet::Util::Reference.method_defined?(method)
       options[:format] = method
     else
-      raise "Invalid output format #{arg}"
+      raise _("Invalid output format %{arg}") % { arg: arg }
     end
   end
 
@@ -34,7 +34,7 @@ class Puppet::Application::Doc < Puppet::Application
     if Puppet::Util::Reference.modes.include?(arg) or arg.intern==:rdoc
       options[:mode] = arg.intern
     else
-      raise "Invalid output mode #{arg}"
+      raise _("Invalid output mode %{arg}") % { arg: arg }
     end
   end
 
@@ -127,7 +127,7 @@ HELP
       files << ::File.dirname(env.manifest) if env.manifest != Puppet::Node::Environment::NO_MANIFEST
     end
     files += command_line.args
-    Puppet.info "scanning: #{files.inspect}"
+    Puppet.info _("scanning: %{files}") % { files: files.inspect }
 
     Puppet.settings[:document_all] = options[:all] || false
     begin
@@ -139,7 +139,7 @@ HELP
         Puppet::Util::RDoc.rdoc(options[:outputdir], files, options[:charset])
       end
     rescue => detail
-      Puppet.log_exception(detail, "Could not generate documentation: #{detail}")
+      Puppet.log_exception(detail, _("Could not generate documentation: %{detail}") % { detail: detail })
       exit_code = 1
     end
     exit exit_code
@@ -151,13 +151,13 @@ HELP
     exit_code = 0
     require 'puppet/util/reference'
     options[:references].sort { |a,b| a.to_s <=> b.to_s }.each do |name|
-      raise "Could not find reference #{name}" unless section = Puppet::Util::Reference.reference(name)
+      raise _("Could not find reference %{name}") % { name: name } unless section = Puppet::Util::Reference.reference(name)
 
       begin
         # Add the per-section text, but with no ToC
         text += section.send(options[:format], with_contents)
       rescue => detail
-        Puppet.log_exception(detail, "Could not generate reference #{name}: #{detail}")
+        Puppet.log_exception(detail, _("Could not generate reference %{name}: %{detail}") % { name: name, detail: detail })
         exit_code = 1
         next
       end