Ticket #1100: updated-patch

*** lib/puppet/defaults.rb.orig 2008-02-25 08:18:24.000000000 -0500
--- lib/puppet/defaults.rb      2008-02-28 16:13:00.000000000 -0500
***************
*** 397,402 ****
--- 397,404 ----
          :ignoreschedules => [false,
              "Boolean; whether puppetd should ignore schedules.  This is useful
              for initial puppetd runs."],
+         :ignoresplay => [false,
+             "Boolean; whether puppetd shouldn't splay when triggered by puppetrun"],
          :puppetport => [8139, "Which port puppetd listens on."],
          :noop => [false, "Whether puppetd should be run in noop mode."],
          :runinterval => [1800, # 30 minutes
*** lib/puppet/network/client/master.rb.orig    2008-02-25 08:18:24.000000000 -0500
--- lib/puppet/network/client/master.rb 2008-02-28 16:13:00.000000000 -0500
***************
*** 538,544 ****
  
      # Sleep when splay is enabled; else just return.
      def splay
!         return unless Puppet[:splay]
  
          limit = Integer(Puppet[:splaylimit])
  
--- 538,546 ----
  
      # Sleep when splay is enabled; else just return.
      def splay
!         return if Puppet::Util::Storage.cache(:configuration)[:prignoresplay] or
!                   not Puppet[:splay] or
!                   ( Puppet[:ignoresplay] and Puppet::Util::Storage.cache(:configuration)[:prtrigger] )
  
          limit = Integer(Puppet[:splaylimit])
  
*** lib/puppet/network/handler/runner.rb.orig   2008-02-25 08:18:12.000000000 -0500
--- lib/puppet/network/handler/runner.rb        2008-02-28 16:13:00.000000000 -0500
***************
*** 12,18 ****
  
          # Run the client configuration right now, optionally specifying
          # tags and whether to ignore schedules
!         def run(tags = nil, ignoreschedules = false, fg = true, client = nil, clientip = nil)
              # We need to retrieve the client
              master = Puppet::Network::Client.client(:Master).instance
  
--- 12,18 ----
  
          # Run the client configuration right now, optionally specifying
          # tags and whether to ignore schedules
!         def run(tags = nil, ignoreschedules = false, ignoresplay = false, fg = true, client = nil, clientip = nil)
              # We need to retrieve the client
              master = Puppet::Network::Client.client(:Master).instance
  
***************
*** 33,38 ****
--- 33,42 ----
                  ignoreschedules == nil
              end
  
+             if ignoresplay == ""
+                 ignoresplay == nil
+             end
+ 
              msg = ""
              if client
                  msg = "%s(%s) " % [client, clientip]
***************
*** 46,51 ****
--- 50,62 ----
                  msg += " ignoring schedules"
              end
  
+             if ignoresplay
+                 msg += " not splaying"
+                 Puppet::Util::Storage.cache(:configuration)[:prignoresplay] = 1
+             end
+ 
+             Puppet::Util::Storage.cache(:configuration)[:prtrigger] = true
+ 
              Puppet.notice msg
  
              # And then we need to tell it to run, with this extra info.
*** bin/puppetrun.orig  2008-02-28 16:12:29.000000000 -0500
--- bin/puppetrun       2008-02-28 16:13:00.000000000 -0500
***************
*** 8,14 ****
  # = Usage
  #
  #   puppetrun [-a|--all] [-c|--class <class>] [-d|--debug] [-f|--foreground]
! #       [-h|--help] [--host <host>] [--no-fqdn] [--ignoreschedules]
  #       [-t|--tag <tag>] [--test]
  #
  # = Description
--- 8,14 ----
  # = Usage
  #
  #   puppetrun [-a|--all] [-c|--class <class>] [-d|--debug] [-f|--foreground]
! #       [-h|--help] [--host <host>] [--no-fqdn] [--ignoreschedules] [--ignoresplay]
  #       [-t|--tag <tag>] [--test]
  #
  # = Description
***************
*** 205,210 ****
--- 205,211 ----
  
  options = {
      :ignoreschedules => false,
+     :ignoresplay => false,
      :foreground => false,
      :parallel => 1,
      :debug => false,
***************
*** 228,233 ****
--- 229,236 ----
                  exit
              when "--ignoreschedules"
                  options[:ignoreschedules] = true
+             when "--ignoresplay"
+                 options[:ignoresplay] = true
              when "--no-fqdn"
                  options[:fqdn] = false
              when "--all"
***************
*** 346,352 ****
  
              print "Triggering %s\n" % host
              begin
!                 result = client.run(tags, options[:ignoreschedules], options[:foreground])
              rescue => detail
                  $stderr.puts "Host %s failed: %s\n" % [host, detail]
                  exit(2)
--- 349,355 ----
  
              print "Triggering %s\n" % host
              begin
!                 result = client.run(tags, options[:ignoreschedules], options[:ignoresplay], options[:foreground])
              rescue => detail
                  $stderr.puts "Host %s failed: %s\n" % [host, detail]
                  exit(2)