puppet 3.2.4 → 3.3.0.rc2

data/lib/puppet/daemon.rb

@@ -1,13 +1,33 @@
-require 'puppet'
-require 'puppet/util/pidlock'
 require 'puppet/application'
 require 'puppet/scheduler'
 
-# A module that handles operations common to all daemons.  This is included
-# into the Server and Client base classes.
+# Run periodic actions and a network server in a daemonized process.
+#
+# A Daemon has 3 parts:
+#   * config reparse
+#   * (optional) an agent that responds to #run
+#   * (optional) a server that response to #stop, #start, and #wait_for_shutdown
+#
+# The config reparse will occur periodically based on Settings. The server will
+# be started and is expected to manage its own run loop (and so not block the
+# start call). The server will, however, still be waited for by using the
+# #wait_for_shutdown method. The agent is run periodically and a time interval
+# based on Settings. The config reparse will update this time interval when
+# needed.
+#
+# The Daemon is also responsible for signal handling, starting, stopping,
+# running the agent on demand, and reloading the entire process. It ensures
+# that only one Daemon is running by using a lockfile.
+#
+# @api private
 class Puppet::Daemon
   attr_accessor :agent, :server, :argv
 
+  def initialize(pidfile, scheduler = Puppet::Scheduler::Scheduler.new())
+    @scheduler = scheduler
+    @pidfile = pidfile
+  end
+
   def daemonname
     Puppet.run_mode.name
   end
@@ -26,6 +46,8 @@ class Puppet::Daemon
 
     Process.setsid
     Dir.chdir("/")
+
+    close_streams
   end
 
   # Close stdin/stdout/stderr so that we can finish our transition into 'daemon' mode.
@@ -52,19 +74,6 @@ class Puppet::Daemon
     Puppet::Daemon.close_streams
   end
 
-  # Create a pidfile for our daemon, so we can be stopped and others
-  # don't try to start.
-  def create_pidfile
-    Puppet::Util.synchronize_on(Puppet.run_mode.name,Sync::EX) do
-      raise "Could not create PID file: #{pidfile}" unless Puppet::Util::Pidlock.new(pidfile).lock
-    end
-  end
-
-  # Provide the path to our pidfile.
-  def pidfile
-    Puppet[:pidfile]
-  end
-
   def reexec
     raise Puppet::DevError, "Cannot reexec unless ARGV arguments are set" unless argv
     command = $0 + " " + argv.join(" ")
@@ -83,13 +92,6 @@ class Puppet::Daemon
     agent.run({:splay => false})
   end
 
-  # Remove the pid file for our daemon.
-  def remove_pidfile
-    Puppet::Util.synchronize_on(Puppet.run_mode.name,Sync::EX) do
-      Puppet::Util::Pidlock.new(pidfile).unlock
-    end
-  end
-
   def restart
     Puppet::Application.restart!
     reexec unless agent and agent.running?
@@ -136,18 +138,29 @@ class Puppet::Daemon
     # Start the listening server, if required.
     server.start if server
 
-    # now that the server has started, we've waited just about as long as possible to close
-    #  our streams and become a "real" daemon process.  This is in hopes of allowing
-    #  errors to have the console available as a fallback for logging for as long as
-    #  possible.
-    close_streams if Puppet[:daemonize]
-
     # Finally, loop forever running events - or, at least, until we exit.
     run_event_loop
 
     server.wait_for_shutdown if server
   end
 
+  private
+
+  # Create a pidfile for our daemon, so we can be stopped and others
+  # don't try to start.
+  def create_pidfile
+    Puppet::Util.synchronize_on(Puppet.run_mode.name,Sync::EX) do
+      raise "Could not create PID file: #{@pidfile.file_path}" unless @pidfile.lock
+    end
+  end
+
+  # Remove the pid file for our daemon.
+  def remove_pidfile
+    Puppet::Util.synchronize_on(Puppet.run_mode.name,Sync::EX) do
+      @pidfile.unlock
+    end
+  end
+
   def run_event_loop
     agent_run = Puppet::Scheduler.create_job(Puppet[:runinterval], Puppet[:splay], Puppet[:splaylimit]) do
       # Splay for the daemon is handled in the scheduler
@@ -167,9 +180,7 @@ class Puppet::Daemon
     reparse_run.disable if Puppet[:filetimeout] == 0
     agent_run.disable unless agent
 
-    scheduler = Puppet::Scheduler::Scheduler.new([reparse_run, agent_run])
-
-    scheduler.run_loop
+    @scheduler.run_loop([reparse_run, agent_run])
   end
 end
 

data/lib/puppet/defaults.rb

@@ -1,8 +1,13 @@
-# The majority of Puppet's configuration settings are set in this file.
-
-
 module Puppet
 
+  def self.default_diffargs
+    if (Facter.value(:kernel) == "AIX" && Facter.value(:kernelmajversion) == "5300")
+      ""
+    else
+      "-u"
+    end
+  end
+
   ############################################################################################
   # NOTE: For information about the available values for the ":type" property of settings,
   #   see the docs for Settings.define_settings
@@ -80,7 +85,9 @@ module Puppet
     :rundir => {
       :default  => nil,
       :type     => :directory,
-      :mode     => 01777,
+      :mode     => 0755,
+      :owner    => "service",
+      :group    => "service",
       :desc     => "Where Puppet PID files are kept."
     },
     :genconfig => {
@@ -173,7 +180,7 @@ module Puppet
             "this provides the default environment for nodes we know nothing about."
     },
     :diff_args => {
-        :default  => "-u",
+        :default  => default_diffargs,
         :desc     => "Which arguments to pass to the diff command when printing differences between\n" +
             "files. The command to use can be chosen with the `diff` setting.",
     },
@@ -236,6 +243,19 @@ module Puppet
       :desc    => "The hiera configuration file. Puppet only reads this file on startup, so you must restart the puppet master every time you edit it.",
       :type    => :file,
     },
+    :binder => {
+      :default => false,
+      :desc    => "Turns the binding system on or off. This includes hiera-2 and data in modules.  The binding system aggregates data from
+      modules and other locations and makes them available for lookup.  The binding system is experimental and any or all of it may change.",
+      :type    => :boolean,
+    },
+    :binder_config => {
+      :default => nil,
+      :desc    => "The binder configuration file. Puppet reads this file on each request to configure the bindings system.
+      If set to nil (the default), a $confdir/binder_config.yaml is optionally loaded. If it does not exists, a default configuration
+      is used. If the setting :binding_config is specified, it must reference a valid and existing yaml file.",
+      :type    => :file,
+    },
     :catalog_terminus => {
       :type       => :terminus,
       :default    => "compiler",
@@ -316,7 +336,7 @@ module Puppet
       Requires that `puppet queue` be running.",
         :hook     => proc do |value|
           if value
-            # This reconfigures the terminii for Node, Facts, and Catalog
+            # This reconfigures the termini for Node, Facts, and Catalog
             Puppet.settings[:storeconfigs] = true
 
             # But then we modify the configuration
@@ -368,6 +388,11 @@ module Puppet
         :desc     => "Freezes the 'main' class, disallowing any code to be added to it.  This\n" +
             "essentially means that you can't have any code outside of a node, class, or definition other\n" +
             "than in the site manifest.",
+    },
+    :stringify_facts => {
+      :default => true,
+      :type    => :boolean,
+      :desc    => "Flatten fact values to strings using #to_s. Means you can't have arrays or hashes as fact values.",
     }
   )
   Puppet.define_settings(:module_tool,
@@ -378,6 +403,10 @@ module Puppet
     :module_working_dir => {
         :default  => '$vardir/puppet-module',
         :desc     => "The directory into which module tool data is stored",
+    },
+    :module_skeleton_dir => {
+        :default  => '$module_working_dir/skeleton',
+        :desc     => "The directory which the skeleton for module tool generate is stored.",
     }
   )
 
@@ -525,16 +554,6 @@ EOT
       :owner => "service",
       :desc => "Where each client stores the CA certificate."
     },
-    ## JJM - The ssl_client_ca_chain setting is commented out because it is
-    # intended for (#3143) and is not expected to be used until CA chaining is
-    # supported.
-    # :ssl_client_ca_chain => {
-    #   :type  => :file,
-    #   :mode  => 0644,
-    #   :owner => "service",
-    #   :desc  => "The list of CA certificate to complete the chain of trust to CA certificates \n" <<
-    #             "listed in the ssl_client_ca_auth file."
-    # },
     :ssl_client_ca_auth => {
       :type  => :file,
       :mode  => 0644,
@@ -544,16 +563,6 @@ EOT
                 "listed in this file.  If this setting has no value then the Puppet master's CA \n" <<
                 "certificate (localcacert) will be used."
     },
-    ## JJM - The ssl_server_ca_chain setting is commented out because it is
-    # intended for (#3143) and is not expected to be used until CA chaining is
-    # supported.
-    # :ssl_server_ca_chain => {
-    #   :type  => :file,
-    #   :mode  => 0644,
-    #   :owner => "service",
-    #   :desc  => "The list of CA certificate to complete the chain of trust to CA certificates \n" <<
-    #             "listed in the ssl_server_ca_auth file."
-    # },
     :ssl_server_ca_auth => {
       :type  => :file,
       :mode  => 0644,
@@ -1220,6 +1229,18 @@ EOT
       turn off waiting for certificates by specifying a time of 0, in which case
       puppet agent will exit if it cannot get a cert.
       #{AS_DURATION}",
+    },
+    :ordering => {
+      :type => :enum,
+      :values => ["manifest", "title-hash", "random"],
+      :default => "title-hash",
+      :desc => "Controls the default ordering to use in the absence of any
+      dependency information. By default this is 'title-hash', which is an
+      opaque, stable, random order. The value of 'manifest' will use the order
+      in which the resources were added to the catalog, which matches the order
+      that the puppet language executes. The final value of 'random' causes
+      resources to be assigned a random order, while still obeying declared
+      dependencies."
     }
   )
 
@@ -1297,6 +1318,16 @@ EOT
     :smtpserver => {
         :default  => "none",
         :desc     => "The server through which to send email reports.",
+    },
+    :smtpport => {
+        :default  => 25,
+        :desc     => "The TCP port through which to send email reports.",
+    },
+    :smtphelo => {
+        :default  => Facter["fqdn"].value,
+        :desc     => "The name by which we identify ourselves in SMTP HELO for reports.
+          If you send to a smtpserver which does strict HELO checking (as with Postfix's
+          `smtpd_helo_restrictions` access controls), you may need to ensure this resolves.",
     }
   )
 

data/lib/puppet/error.rb

@@ -1,7 +1,7 @@
 module Puppet
   # The base class for all Puppet errors. It can wrap another exception
   class Error < RuntimeError
-    attr_reader :original
+    attr_accessor :original
     def initialize(message, original=nil)
       super(message)
       @original = original

data/lib/puppet/external/dot.rb

@@ -39,9 +39,9 @@ module DOT
     'height',      # default: .5; height in inches
     'label',       # default: node name; any string
     'layer',       # default: overlay range; all, id or id:id
-    'orientation', # dafault: 0.0; node rotation angle
+    'orientation', # default: 0.0; node rotation angle
     'peripheries', # shape-dependent number of node boundaries
-    'regular',     # default:  false; force polygon to be regular
+    'regular',     # default: false; force polygon to be regular
     'shape',       # default: ellipse; node shape; see Section 2.1 and Appendix E
     'shapefile',   # external EPSF or SVG custom shape file
     'sides',       # default: 4; number of sides for shape=polygon

data/lib/puppet/external/nagios/base.rb

@@ -215,7 +215,7 @@ class Nagios::Base
       # Now access the parameters directly, to make it at least less
       # likely we'll end up in an infinite recursion.
       if mname.to_s =~ /=$/
-        @parameters[pname] = *args
+        @parameters[pname] = args.first
       else
         return @parameters[mname]
       end
@@ -271,7 +271,6 @@ class Nagios::Base
   # okay, this sucks
   # how do i get my list of ocs?
   def to_ldif
-    base = self.class.ldapbase
     str = self.dn + "\n"
     ocs = Array.new
     if self.class.ocs
@@ -410,7 +409,6 @@ class Nagios::Base
   end
 
   newtype :servicedependency do
-    auxiliary = true
     setparameters :dependent_host_name, :dependent_hostgroup_name,
       :dependent_service_description, :host_name, :hostgroup_name,
       :service_description, :inherits_parent, :execution_failure_criteria,
@@ -433,7 +431,6 @@ class Nagios::Base
   end
 
   newtype :hostdependency do
-    auxiliary = true
     setparameters :dependent_host_name, :dependent_hostgroup_name, :host_name,
       :hostgroup_name, :inherits_parent, :execution_failure_criteria,
       :notification_failure_criteria, :dependency_period,
@@ -454,7 +451,6 @@ class Nagios::Base
   end
 
   newtype :hostextinfo do
-    auxiliary = true
     setparameters :host_name, :notes, :notes_url, :icon_image, :icon_image_alt,
       :vrml_image, :statusmap_image, "2d_coords".intern, "3d_coords".intern,
       :register, :use
@@ -463,7 +459,6 @@ class Nagios::Base
   end
 
   newtype :serviceextinfo do
-    auxiliary = true
 
     setparameters :host_name, :service_description, :notes, :notes_url,
       :action_url, :icon_image, :icon_image_alt,

data/lib/puppet/external/pson/common.rb

@@ -127,7 +127,7 @@ module PSON
   #   defiance of RFC 4627 to be parsed by the Parser. This option defaults
   #   to false.
   # * *create_additions*: If set to false, the Parser doesn't create
-  #   additions even if a matchin class and create_id was found. This option
+  #   additions even if a matching class and create_id was found. This option
   #   defaults to true.
   def parse(source, opts = {})
     PSON.parser.new(source, opts).parse
@@ -146,7 +146,7 @@ module PSON
   #   defiance of RFC 4627 to be parsed by the Parser. This option defaults
   #   to true.
   # * *create_additions*: If set to false, the Parser doesn't create
-  #   additions even if a matchin class and create_id was found. This option
+  #   additions even if a matching class and create_id was found. This option
   #   defaults to true.
   def parse!(source, opts = {})
     opts = {

data/lib/puppet/external/pson/pure/generator.rb

@@ -58,7 +58,7 @@ module PSON
   module Pure
     module Generator
       # This class is used to create State instances, that are use to hold data
-      # while generating a PSON text from a a Ruby data structure.
+      # while generating a PSON text from a Ruby data structure.
       class State
         # Creates a State object from _opts_, which ought to be Hash to create
         # a new State instance configured by _opts_, something else to create
@@ -366,7 +366,7 @@ module PSON
           # This method creates a raw object hash, that can be nested into
           # other data structures and will be unparsed as a raw string. This
           # method should be used, if you want to convert raw strings to PSON
-          # instead of UTF-8 strings, e. g. binary data.
+          # instead of UTF-8 strings, e.g. binary data.
           def to_pson_raw_object
             {
               PSON.create_id  => self.class.name,

data/lib/puppet/external/pson/pure/parser.rb

@@ -61,7 +61,7 @@ module PSON
       #   defiance of RFC 4627 to be parsed by the Parser. This option defaults
       #   to false.
       # * *create_additions*: If set to false, the Parser doesn't create
-      #   additions even if a matchin class and create_id was found. This option
+      #   additions even if a matching class and create_id was found. This option
       #   defaults to true.
       # * *object_class*: Defaults to Hash
       # * *array_class*: Defaults to Array

data/lib/puppet/face/ca.rb

@@ -204,7 +204,7 @@ Puppet::Face.define(:ca, '0.1.0') do
 
     when_invoked do |host, options|
       raise "Not a CA" unless Puppet::SSL::CertificateAuthority.ca?
-      unless ca = Puppet::SSL::CertificateAuthority.instance
+      unless Puppet::SSL::CertificateAuthority.instance
         raise "Unable to fetch the CA"
       end
       Puppet::SSL::Host.ca_location = :only

data/lib/puppet/face/config.rb

@@ -36,7 +36,7 @@ Puppet::Face.define(:config, '0.0.1') do
     EOT
 
     when_invoked do |*args|
-      options = args.pop
+      args.pop
 
       args = [ "all" ] if args.empty?
 

data/lib/puppet/face/help.rb

@@ -129,7 +129,7 @@ Detail: "#{detail.message}"
 
   # Return a list of all applications (both legacy and Face applications), along with a summary
   #  of their functionality.
-  # @returns [Array] An Array of Arrays.  The outer array contains one entry per application; each
+  # @return [Array] An Array of Arrays.  The outer array contains one entry per application; each
   #  element in the outer array is a pair whose first element is a String containing the application
   #  name, and whose second element is a String containing the summary for that application.
   def all_application_summaries()
@@ -140,7 +140,7 @@ Detail: "#{detail.message}"
         begin
           face = Puppet::Face[appname, :current]
           result << [appname, face.summary]
-        rescue Puppet::Error => detail
+        rescue Puppet::Error
           result << [ "! #{appname}", "! Subcommand unavailable due to error. Check error logs." ]
         end
       else

data/lib/puppet/face/module/list.rb

@@ -237,8 +237,8 @@ Puppet::Face.define(:module, '1.0.0') do
   #    { :text => "puppetlabs-mysql (v1.0.0)" }
   #
   # The value of a module's :text is affected by three (3) factors: the format
-  # of the tree, it's dependency status, and the location in the modulepath
-  # relative to it's parent.
+  # of the tree, its dependency status, and the location in the modulepath
+  # relative to its parent.
   #
   # Returns a Hash
   #

data/lib/puppet/feature/rails.rb

@@ -23,7 +23,7 @@ Puppet.features.add(:rails) do
 
     require 'active_record'
     require 'active_record/version'
-  rescue LoadError => detail
+  rescue LoadError
     if FileTest.exists?("/usr/share/rails")
       count = 0
       Dir.entries("/usr/share/rails").each do |dir|