puppet 3.0.0.rc5 → 3.0.0.rc7

data/lib/hiera_puppet.rb

@@ -0,0 +1,89 @@
+require 'hiera'
+require 'hiera/scope'
+require 'puppet'
+
+module HieraPuppet
+  module_function
+
+  def lookup(key, default, scope, override, resolution_type)
+    unless scope.respond_to?("[]")
+      scope = Hiera::Scope.new(scope)
+    end
+
+    answer = hiera.lookup(key, default, scope, override, resolution_type)
+
+    if answer.nil?
+      raise(Puppet::ParseError, "Could not find data item #{key} in any Hiera data file and no default supplied")
+    end
+
+    answer
+  end
+
+  def parse_args(args)
+    # Functions called from Puppet manifests like this:
+    #
+    #   hiera("foo", "bar")
+    #
+    # Are invoked internally after combining the positional arguments into a
+    # single array:
+    #
+    #   func = function_hiera
+    #   func(["foo", "bar"])
+    #
+    # Functions called from templates preserve the positional arguments:
+    #
+    #   scope.function_hiera("foo", "bar")
+    #
+    # Deal with Puppet's special calling mechanism here.
+    if args[0].is_a?(Array)
+      args = args[0]
+    end
+
+    if args.empty?
+      raise(Puppet::ParseError, "Please supply a parameter to perform a Hiera lookup")
+    end
+
+    key      = args[0]
+    default  = args[1]
+    override = args[2]
+
+    return [key, default, override]
+  end
+
+  private
+  module_function
+
+  def hiera
+    @hiera ||= Hiera.new(:config => hiera_config)
+  end
+
+  def hiera_config
+    config = {}
+
+    if config_file = hiera_config_file
+      config = Hiera::Config.load(config_file)
+    end
+
+    config[:logger] = 'puppet'
+    config
+  end
+
+  def hiera_config_file
+    config_file = nil
+
+    if Puppet.settings[:hiera_config].is_a?(String)
+      expanded_config_file = File.expand_path(Puppet.settings[:hiera_config])
+      if File.exist?(expanded_config_file)
+        config_file = expanded_config_file
+      end
+    elsif Puppet.settings[:confdir].is_a?(String)
+      expanded_config_file = File.expand_path(File.join(Puppet.settings[:confdir], '/hiera.yaml'))
+      if File.exist?(expanded_config_file)
+        config_file = expanded_config_file
+      end
+    end
+
+    config_file
+  end
+end
+

data/lib/puppet.rb

@@ -94,7 +94,7 @@ module Puppet
     # (rather than using a global variable, as we did previously...).  Would be good to revisit this at some point.
     #
     # --cprice 2012-03-16
-    Puppet::Util::RunMode[@@settings.run_mode]
+    Puppet::Util::RunMode[@@settings.preferred_run_mode]
   end
 
   # Load all of the configuration parameters.

data/lib/puppet/agent.rb

@@ -27,7 +27,7 @@ class Puppet::Agent
   # Perform a run with our client.
   def run(client_options = {})
     if running?
-      Puppet.notice "Run of #{client_class} already in progress; skipping"
+      Puppet.notice "Run of #{client_class} already in progress; skipping  (#{lockfile_path} exists)"
       return
     end
     if disabled?
@@ -70,7 +70,7 @@ class Puppet::Agent
     return unless Puppet[:splay]
     return if splayed?
 
-    time = rand(Integer(Puppet[:splaylimit]) + 1)
+    time = rand(Puppet[:splaylimit] + 1)
     Puppet.info "Sleeping for #{time} seconds (splay is enabled)"
     sleep(time)
     @splayed = true

data/lib/puppet/agent/locker.rb

@@ -1,14 +1,13 @@
 require 'puppet/util/pidlock'
 
-# This module is responsible for encapsulating the logic for
-#  "locking" the puppet agent during a run; in other words,
-#  keeping track of enough state to answer the question
-#  "is there a puppet agent currently running?"
+# This module is responsible for encapsulating the logic for "locking" the
+# puppet agent during a catalog run; in other words, keeping track of enough
+# state to answer the question "is there a puppet agent currently applying a
+# catalog?"
 #
-# The implementation involves writing a lockfile whose contents
-#  are simply the PID of the running agent process.  This is
-#  considered part of the public Puppet API because it used
-#  by external tools such as mcollective.
+# The implementation involves writing a lockfile whose contents are simply the
+# PID of the running agent process.  This is considered part of the public
+# Puppet API because it used by external tools such as mcollective.
 #
 # For more information, please see docs on the website.
 #  http://links.puppetlabs.com/agent_lockfiles
@@ -29,8 +28,12 @@ module Puppet::Agent::Locker
     lockfile.locked?
   end
 
+  def lockfile_path
+    @lockfile_path ||= Puppet[:agent_catalog_run_lockfile]
+  end
+
   def lockfile
-    @lockfile ||= Puppet::Util::Pidlock.new(Puppet[:agent_pidfile])
+    @lockfile ||= Puppet::Util::Pidlock.new(lockfile_path)
 
     @lockfile
   end

data/lib/puppet/application.rb

@@ -265,19 +265,23 @@ class Application
       find(name).new
     end
 
-    #
-    # I think that it would be nice to look into changing this into two methods (getter/setter); however,
-    #  it sounds like this is a desirable feature of our ruby DSL. --cprice 2012-03-06
-    #
-
     # Sets or gets the run_mode name. Sets the run_mode name if a mode_name is
     # passed. Otherwise, gets the run_mode or a default run_mode
     #
     def run_mode( mode_name = nil)
+      if mode_name
+        Puppet.settings.preferred_run_mode = mode_name
+      end
+
       return @run_mode if @run_mode and not mode_name
 
       require 'puppet/util/run_mode'
-      @run_mode = Puppet::Util::RunMode[ mode_name || :user ]
+      @run_mode = Puppet::Util::RunMode[ mode_name || Puppet.settings.preferred_run_mode ]
+    end
+
+    # This is for testing only
+    def clear_everything_for_tests
+      @run_mode = @banner = @run_status = @option_parser_commands = nil
     end
   end
 
@@ -409,8 +413,6 @@ class Application
     option_parser.parse!(self.command_line.args)
   end
 
-
-
   def handlearg(opt, val)
     opt, val = Puppet::Settings.clean_opt(opt, val)
     send(:handle_unknown, opt, val) if respond_to?(:handle_unknown)

data/lib/puppet/application/agent.rb

@@ -9,6 +9,7 @@ class Puppet::Application::Agent < Puppet::Application
   def app_defaults
     super.merge({
       :catalog_terminus => :rest,
+      :catalog_cache_terminus => :json,
       :node_terminus => :rest,
       :facts_terminus => :facter,
     })
@@ -33,7 +34,7 @@ class Puppet::Application::Agent < Puppet::Application
       :client => true,
       :fqdn => nil,
       :serve => [],
-      :digest => :MD5,
+      :digest => 'SHA256',
       :graph => true,
       :fingerprint => false,
     }.each do |opt,val|
@@ -88,7 +89,7 @@ class Puppet::Application::Agent < Puppet::Application
   end
 
   def help
-    <<-HELP
+    <<-'HELP'
 
 puppet-agent(8) -- The puppet agent daemon
 ========
@@ -199,8 +200,8 @@ configuration options can also be generated by running puppet agent with
 
 * --digest:
   Change the certificate fingerprinting digest algorithm. The default is
-  MD5. Valid values depends on the version of OpenSSL installed, but
-  should always at least contain MD5, MD2, SHA1 and SHA256.
+  SHA256. Valid values depends on the version of OpenSSL installed, but
+  will likely contain MD5, MD2, SHA1 and SHA256.
 
 * --disable:
   Disable working on the local system. This puts a lock file in place,
@@ -317,10 +318,10 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
       exit(1)
       return
     end
-    unless fingerprint = cert.fingerprint(options[:digest])
+    unless digest = cert.digest(options[:digest].to_s)
       raise ArgumentError, "Could not get fingerprint for digest '#{options[:digest]}'"
     end
-    puts fingerprint
+    puts digest.to_s
   end
 
   def onetime
@@ -378,6 +379,7 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
   end
 
   def setup_listen
+    Puppet.warning "Puppet --listen / kick is deprecated. See http://links.puppetlabs.com/puppet-kick-deprecation"
     unless FileTest.exists?(Puppet[:rest_authconfig])
       Puppet.err "Will not start without authorization file #{Puppet[:rest_authconfig]}"
       exit(14)
@@ -385,7 +387,7 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
 
     require 'puppet/network/server'
     # No REST handlers yet.
-    server = Puppet::Network::Server.new(:port => Puppet[:puppetport])
+    server = Puppet::Network::Server.new(Puppet[:bindaddress], Puppet[:puppetport])
 
     @daemon.server = server
   end
@@ -460,7 +462,9 @@ 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
 
-    Puppet::Resource::Catalog.indirection.cache_class = :yaml
+    if Puppet[:catalog_cache_terminus]
+      Puppet::Resource::Catalog.indirection.cache_class = Puppet[:catalog_cache_terminus]
+    end
 
     unless options[:fingerprint]
       setup_agent

data/lib/puppet/application/apply.rb

@@ -31,7 +31,7 @@ class Puppet::Application::Apply < Puppet::Application
   end
 
   def help
-    <<-HELP
+    <<-'HELP'
 
 puppet-apply(8) -- Apply Puppet manifests locally
 ========
@@ -135,7 +135,7 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
 
   def app_defaults
     super.merge({
-      :default_file_terminus => "file_server",
+      :default_file_terminus => :file_server,
     })
   end
 

data/lib/puppet/application/cert.rb

@@ -52,7 +52,7 @@ class Puppet::Application::Cert < Puppet::Application
   end
 
   def help
-    <<-HELP
+    <<-'HELP'
 
 puppet-cert(8) -- Manage certificates and requests
 ========
@@ -91,8 +91,8 @@ unless the '--all' option is set.
   both signed and unsigned, will be removed.
 
 * fingerprint:
-  Print the DIGEST (defaults to md5) fingerprint of a host's
-  certificate.
+  Print the DIGEST (defaults to the signing algorithm) fingerprint of a
+  host's certificate.
 
 * generate:
   Generate a certificate for a named client. A certificate/keypair will
@@ -140,9 +140,9 @@ configuration options can also be generated by running puppet cert with
   'clean', 'list', and 'fingerprint' actions.
 
 * --digest:
-  Set the digest for fingerprinting (defaults to md5). Valid values
-  depends on your openssl and openssl ruby extension version, but should
-  contain at least md5, sha1, md2, sha256.
+  Set the digest for fingerprinting (defaults to the the digest used when
+  signing the cert). Valid values depends on your openssl and openssl ruby
+  extension version.
 
 * --debug:
   Enable full debugging.

data/lib/puppet/application/certificate.rb

@@ -7,10 +7,7 @@ class Puppet::Application::Certificate < Puppet::Application::IndirectionBase
       # 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)
+      Puppet.settings.preferred_run_mode = "master"
     end
 
     super

data/lib/puppet/application/describe.rb

@@ -179,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

@@ -11,6 +11,7 @@ class Puppet::Application::Device < Puppet::Application
   def app_defaults
     super.merge({
       :catalog_terminus => :rest,
+      :catalog_cache_terminus => :json,
       :node_terminus => :rest,
       :facts_terminus => :network_device,
     })
@@ -63,7 +64,7 @@ class Puppet::Application::Device < Puppet::Application
   end
 
     def help
-      <<-HELP
+      <<-'HELP'
 
 puppet-device(8) -- Manage remote network devices
 ========
@@ -236,6 +237,8 @@ Licensed under the Apache 2.0 License
 
     Puppet::Transaction::Report.indirection.terminus_class = :rest
 
-    Puppet::Resource::Catalog.indirection.cache_class = :yaml
+    if Puppet[:catalog_cache_terminus]
+      Puppet::Resource::Catalog.indirection.cache_class = Puppet[:catalog_cache_terminus].intern
+    end
   end
 end

data/lib/puppet/application/doc.rb

@@ -49,7 +49,7 @@ class Puppet::Application::Doc < Puppet::Application
   end
 
   def help
-    <<-HELP
+    <<-'HELP'
 
 puppet-doc(8) -- Generate Puppet documentation and references
 ========

data/lib/puppet/application/face_base.rb

@@ -4,8 +4,6 @@ require 'optparse'
 require 'pp'
 
 class Puppet::Application::FaceBase < Puppet::Application
-  run_mode :agent
-
   option("--debug", "-d") do |arg|
     Puppet::Util::Log.level = :debug
   end
@@ -18,16 +16,6 @@ class Puppet::Application::FaceBase < Puppet::Application
     self.render_as = format.to_sym
   end
 
-  # This seems like a bad thing; it seems like--in an ideal world--a given app/face should have one constant run mode.
-  #  This isn't currently possible because of issues relating to the certificate authority, but I've left some notes
-  #  about "run_mode" in settings.rb and defaults.rb, and if we are able to tighten up the behavior / implementation
-  #  of that setting, we might want to revisit this.  --cprice 2012-03-16
-  option("--mode RUNMODE", "-r") do |arg|
-    raise "Invalid run mode #{arg}; supported modes are user, agent, master" unless %w{user agent master}.include?(arg)
-    self.class.run_mode(arg.to_sym)
-  end
-
-
   attr_accessor :face, :action, :type, :arguments, :render_as
 
   def render_as=(format)
@@ -97,7 +85,9 @@ class Puppet::Application::FaceBase < Puppet::Application
           unless Puppet.settings.boolean? option.name then
             # As far as I can tell, we treat non-bool options as always having
             # a mandatory argument. --daniel 2011-04-05
-            index += 1          # ...so skip the argument.
+            # ... But, the mandatory argument will not be the next item if an = is
+            # employed in the long form of the option. --jeffmccune 2012-09-18
+            index += 1 unless item =~ /^--#{option.name}=/
           end
         elsif option = find_application_argument(item) then
           index += 1 if (option[:argument] and not option[:optional])

data/lib/puppet/application/filebucket.rb

@@ -11,7 +11,7 @@ class Puppet::Application::Filebucket < Puppet::Application
   attr :args
 
   def help
-    <<-HELP
+    <<-'HELP'
 
 puppet-filebucket(8) -- Store and retrieve files in a filebucket
 ========

data/lib/puppet/application/inspect.rb

@@ -17,7 +17,7 @@ class Puppet::Application::Inspect < Puppet::Application
   end
 
   def help
-    <<-HELP
+    <<-'HELP'
 
 puppet-inspect(8) -- Send an inspection report
 ========

data/lib/puppet/application/kick.rb

@@ -36,7 +36,7 @@ class Puppet::Application::Kick < Puppet::Application
   end
 
   def help
-    <<-HELP
+    <<-'HELP'
 
 puppet-kick(8) -- Remotely control puppet agent
 ========
@@ -298,7 +298,9 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
   end
 
   def setup
+    super()
     raise Puppet::Error.new("Puppet kick is not supported on Microsoft Windows") if Puppet.features.microsoft_windows?
+    Puppet.warning "Puppet kick is deprecated. See http://links.puppetlabs.com/puppet-kick-deprecation"
 
     if options[:debug]
       Puppet::Util::Log.level = :debug
@@ -306,7 +308,7 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
       Puppet::Util::Log.level = :info
     end
 
-    if Puppet[:node_terminus] == "ldap" and (options[:all] or @classes)
+    if Puppet[:node_terminus] == :ldap and (options[:all] or @classes)
       if options[:all]
         @hosts = Puppet::Node.indirection.search("whatever", :fqdn => options[:fqdn]).collect { |node| node.name }
         puts "all: #{@hosts.join(", ")}"