puppet 2.6.18 → 2.7.1

data/lib/puppet/transaction/event.rb

@@ -48,7 +48,7 @@ class Puppet::Transaction::Event
   end
 
   def to_yaml_properties
-    (YAML_ATTRIBUTES & instance_variables).sort
+    (YAML_ATTRIBUTES.map {|ya| ya.to_s} & instance_variables.map{|iv| iv.to_s}).sort
   end
 
   private

data/lib/puppet/transaction/event_manager.rb

@@ -31,7 +31,7 @@ class Puppet::Transaction::EventManager
   # Queue events for other resources to respond to.  All of these events have
   # to be from the same resource.
   def queue_events(resource, events)
-    @events += events
+    #@events += events
 
     # Do some basic normalization so we're not doing so many
     # graph queries for large sets of events.
@@ -47,19 +47,33 @@ class Puppet::Transaction::EventManager
       # Collect the targets of any subscriptions to those events.  We pass
       # the parent resource in so it will override the source in the events,
       # since eval_generated children can't have direct relationships.
+      received = (event.name != :restarted)
       relationship_graph.matching_edges(event, resource).each do |edge|
+        received ||= true unless edge.target.is_a?(Puppet::Type.type(:whit))
         next unless method = edge.callback
         next unless edge.target.respond_to?(method)
 
         queue_events_for_resource(resource, edge.target, method, list)
       end
+      @events << event if received
 
       queue_events_for_resource(resource, resource, :refresh, [event]) if resource.self_refresh? and ! resource.deleting?
     end
   end
 
   def queue_events_for_resource(source, target, callback, events)
-    source.info "Scheduling #{callback} of #{target}"
+    whit = Puppet::Type.type(:whit)
+
+    # The message that a resource is refreshing the completed-whit for its own class
+    # is extremely counter-intuitive. Basically everything else is easy to understand,
+    # if you suppress the whit-lookingness of the whit resources
+    refreshing_c_whit = target.is_a?(whit) && target.name =~ /^completed_/
+
+    if refreshing_c_whit
+      source.debug "The container #{target} will propagate my #{callback} event"
+    else
+      source.info "Scheduling #{callback} of #{target}"
+    end
 
     @event_queues[target] ||= {}
     @event_queues[target][callback] ||= []
@@ -79,7 +93,9 @@ class Puppet::Transaction::EventManager
     process_noop_events(resource, callback, events) and return false unless events.detect { |e| e.status != "noop" }
     resource.send(callback)
 
-    resource.notice "Triggered '#{callback}' from #{events.length} events"
+    if not resource.is_a?(Puppet::Type.type(:whit))
+      resource.notice "Triggered '#{callback}' from #{events.length} events"
+    end
     return true
   rescue => detail
     resource.err "Failed to call #{callback}: #{detail}"

data/lib/puppet/transaction/report.rb

@@ -10,8 +10,8 @@ class Puppet::Transaction::Report
 
   indirects :report, :terminus_class => :processor
 
-  attr_accessor :configuration_version, :host
-  attr_reader :resource_statuses, :logs, :metrics, :time, :kind, :status
+  attr_accessor :configuration_version
+  attr_reader :resource_statuses, :logs, :metrics, :host, :time, :kind, :status
 
   # This is necessary since Marshall doesn't know how to
   # dump hash with default proc (see below @records)
@@ -53,7 +53,13 @@ class Puppet::Transaction::Report
     end
   end
 
+  def prune_internal_data
+    resource_statuses.delete_if {|name,res| res.resource_type == 'Whit'}
+  end
+
   def finalize_report
+    prune_internal_data
+
     resource_metrics = add_metric(:resources, calculate_resource_metrics)
     add_metric(:time, calculate_time_metrics)
     change_metric = calculate_change_metric
@@ -67,7 +73,7 @@ class Puppet::Transaction::Report
     @logs = []
     @resource_statuses = {}
     @external_times ||= {}
-    @host = Puppet[:node_name_value]
+    @host = Puppet[:certname]
     @time = Time.now
     @kind = kind
     @report_format = 2

data/lib/puppet/type.rb

@@ -116,6 +116,26 @@ class Type
     ens
   end
 
+  def self.apply_to_device
+    @apply_to = :device
+  end
+
+  def self.apply_to_host
+    @apply_to = :host
+  end
+
+  def self.apply_to_all
+    @apply_to = :both
+  end
+
+  def self.apply_to
+    @apply_to ||= :host
+  end
+
+  def self.can_apply_to(target)
+    [ target == :device ? :device : :host, :both ].include?(apply_to)
+  end
+
   # Deal with any options passed into parameters.
   def self.handle_param_options(name, options)
     # If it's a boolean parameter, create a method to test the value easily
@@ -598,14 +618,8 @@ class Type
   ###############################
   # Code related to the container behaviour.
 
-  # this is a retarded hack method to get around the difference between
-  # component children and file children
-  def self.depthfirst?
-    @depthfirst
-  end
-
   def depthfirst?
-    self.class.depthfirst?
+    false
   end
 
   # Remove an object.  The argument determines whether the object's
@@ -862,6 +876,12 @@ class Type
     # Put the default provider first, then the rest of the suitable providers.
     provider_instances = {}
     providers_by_source.collect do |provider|
+      all_properties = self.properties.find_all do |property|
+        provider.supports_parameter?(property)
+      end.collect do |property|
+        property.name
+      end
+
       provider.instances.collect do |instance|
         # We always want to use the "first" provider instance we find, unless the resource
         # is already managed and has a different provider set
@@ -872,7 +892,9 @@ class Type
         end
         provider_instances[instance.name] = instance
 
-        new(:name => instance.name, :provider => instance, :audit => :all)
+        result = new(:name => instance.name, :provider => instance)
+        properties.each { |name| result.newattr(name) }
+        result
       end
     end.flatten.compact
   end
@@ -943,13 +965,13 @@ class Type
       schedule object, and then reference the name of that object to use
       that for your schedule:
 
-          schedule { daily:
+          schedule { 'daily':
             period => daily,
-            range => \"2-4\"
+            range  => \"2-4\"
           }
 
           exec { \"/usr/bin/apt-get update\":
-            schedule => daily
+            schedule => 'daily'
           }
 
       The creation of the schedule object does not need to appear in the
@@ -1041,9 +1063,9 @@ class Type
 
   newmetaparam(:alias) do
     desc "Creates an alias for the object.  Puppet uses this internally when you
-      provide a symbolic name:
+      provide a symbolic title:
 
-          file { sshdconfig:
+          file { 'sshdconfig':
             path => $operatingsystem ? {
               solaris => \"/usr/local/etc/ssh/sshd_config\",
               default => \"/etc/ssh/sshd_config\"
@@ -1051,30 +1073,30 @@ class Type
             source => \"...\"
           }
 
-          service { sshd:
-            subscribe => File[sshdconfig]
+          service { 'sshd':
+            subscribe => File['sshdconfig']
           }
 
-      When you use this feature, the parser sets `sshdconfig` as the name,
+      When you use this feature, the parser sets `sshdconfig` as the title,
       and the library sets that as an alias for the file so the dependency
-      lookup for `sshd` works.  You can use this parameter yourself,
+      lookup in `Service['sshd']` works.  You can use this metaparameter yourself,
       but note that only the library can use these aliases; for instance,
       the following code will not work:
 
           file { \"/etc/ssh/sshd_config\":
             owner => root,
             group => root,
-            alias => sshdconfig
+            alias => 'sshdconfig'
           }
 
-          file { sshdconfig:
+          file { 'sshdconfig':
             mode => 644
           }
 
       There's no way here for the Puppet parser to know that these two stanzas
       should be affecting the same file.
 
-      See the [Language Tutorial](http://docs.puppetlabs.com/guides/language_tutorial.html) for more information.
+      See the [Language Guide](http://docs.puppetlabs.com/guides/language_guide.html) for more information.
 
       "
 
@@ -1208,7 +1230,7 @@ class Type
   # solution, but it works.
 
   newmetaparam(:require, :parent => RelationshipMetaparam, :attributes => {:direction => :in, :events => :NONE}) do
-    desc "One or more objects that this object depends on.
+    desc "References to one or more objects that this object depends on.
       This is used purely for guaranteeing that changes to required objects
       happen before the dependent object.  For instance:
 
@@ -1218,8 +1240,8 @@ class Type
           }
 
           file { \"/usr/local/scripts/myscript\":
-            source => \"puppet://server/module/myscript\",
-            mode => 755,
+            source  => \"puppet://server/module/myscript\",
+            mode    => 755,
             require => File[\"/usr/local/scripts\"]
           }
 
@@ -1233,7 +1255,7 @@ class Type
       ways to autorequire objects, so if you think Puppet could be
       smarter here, let us know.
 
-      In fact, the above code was redundant -- Puppet will autorequire
+      In fact, the above code was redundant --- Puppet will autorequire
       any parent directories that are being managed; it will
       automatically realize that the parent directory should be created
       before the script is pulled down.
@@ -1249,40 +1271,41 @@ class Type
   end
 
   newmetaparam(:subscribe, :parent => RelationshipMetaparam, :attributes => {:direction => :in, :events => :ALL_EVENTS, :callback => :refresh}) do
-    desc "One or more objects that this object depends on.  Changes in the
-      subscribed to objects result in the dependent objects being
-      refreshed (e.g., a service will get restarted).  For instance:
+    desc "References to one or more objects that this object depends on. This
+      metaparameter creates a dependency relationship like **require,**
+      and also causes the dependent object to be refreshed when the
+      subscribed object is changed. For instance:
 
           class nagios {
-            file { \"/etc/nagios/nagios.conf\":
+            file { 'nagconf':
+              path   => \"/etc/nagios/nagios.conf\"
               source => \"puppet://server/module/nagios.conf\",
-              alias => nagconf # just to make things easier for me
             }
-            service { nagios:
-              ensure => running,
-              subscribe => File[nagconf]
+            service { 'nagios':
+              ensure    => running,
+              subscribe => File['nagconf']
             }
           }
 
-      Currently the `exec`, `mount` and `service` type support
+      Currently the `exec`, `mount` and `service` types support
       refreshing.
       "
   end
 
   newmetaparam(:before, :parent => RelationshipMetaparam, :attributes => {:direction => :out, :events => :NONE}) do
-    desc %{This parameter is the opposite of **require** -- it guarantees
-      that the specified object is applied later than the specifying
-      object:
+    desc %{References to one or more objects that depend on this object. This
+      parameter is the opposite of **require** --- it guarantees that
+      the specified object is applied later than the specifying object:
 
           file { "/var/nagios/configuration":
             source  => "...",
             recurse => true,
-            before => Exec["nagios-rebuid"]
+            before  => Exec["nagios-rebuid"]
           }
 
           exec { "nagios-rebuild":
             command => "/usr/bin/make",
-            cwd => "/var/nagios/configuration"
+            cwd     => "/var/nagios/configuration"
           }
 
       This will make sure all of the files are up to date before the
@@ -1290,15 +1313,18 @@ class Type
   end
 
   newmetaparam(:notify, :parent => RelationshipMetaparam, :attributes => {:direction => :out, :events => :ALL_EVENTS, :callback => :refresh}) do
-    desc %{This parameter is the opposite of **subscribe** -- it sends events
-      to the specified object:
+    desc %{References to one or more objects that depend on this object. This
+    parameter is the opposite of **subscribe** --- it creates a
+    dependency relationship like **before,** and also causes the
+    dependent object(s) to be refreshed when this object is changed. For
+    instance:
 
           file { "/etc/sshd_config":
             source => "....",
-            notify => Service[sshd]
+            notify => Service['sshd']
           }
 
-          service { sshd:
+          service { 'sshd':
             ensure => running
           }
 
@@ -1314,24 +1340,24 @@ class Type
       By default, all classes get directly added to the
       'main' stage.  You can create new stages as resources:
 
-          stage { [pre, post]: }
+          stage { ['pre', 'post']: }
 
       To order stages, use standard relationships:
 
-          stage { pre: before => Stage[main] }
+          stage { 'pre': before => Stage['main'] }
 
       Or use the new relationship syntax:
 
-          Stage[pre] -> Stage[main] -> Stage[post]
+          Stage['pre'] -> Stage['main'] -> Stage['post']
 
       Then use the new class parameters to specify a stage:
 
-          class { foo: stage => pre }
+          class { 'foo': stage => 'pre' }
 
       Stages can only be set on classes, not individual resources.  This will
       fail:
 
-          file { '/foo': stage => pre, ensure => file }
+          file { '/foo': stage => 'pre', ensure => file }
     }
   end
 
@@ -1416,8 +1442,9 @@ class Type
   def self.provide(name, options = {}, &block)
     name = Puppet::Util.symbolize(name)
 
-    if unprovide(name)
+    if obj = provider_hash[name]
       Puppet.debug "Reloading #{name} #{self.name} provider"
+      unprovide(name)
     end
 
     parent = if pname = options[:parent]
@@ -1440,14 +1467,16 @@ class Type
 
     self.providify
 
-    provider = genclass(
-      name,
-      :parent     => parent,
-      :hash       => provider_hash,
-      :prefix     => "Provider",
-      :block      => block,
-      :include    => feature_module,
-      :extend     => feature_module,
+
+      provider = genclass(
+        name,
+      :parent => parent,
+      :hash => provider_hash,
+      :prefix => "Provider",
+      :block => block,
+      :include => feature_module,
+      :extend => feature_module,
+
       :attributes => options
     )
 
@@ -1461,7 +1490,7 @@ class Type
 
     newparam(:provider) do
       desc "The specific backend for #{self.name.to_s} to use. You will
-        seldom need to specify this -- Puppet will usually discover the
+        seldom need to specify this --- Puppet will usually discover the
         appropriate provider for your platform."
 
       # This is so we can refer back to the type to get a list of
@@ -1507,11 +1536,18 @@ class Type
   end
 
   def self.unprovide(name)
-    if @defaultprovider and @defaultprovider.name == name
-      @defaultprovider = nil
-    end
+    if provider_hash.has_key? name
 
-    rmclass(name, :hash => provider_hash, :prefix => "Provider")
+      rmclass(
+        name,
+        :hash => provider_hash,
+
+        :prefix => "Provider"
+      )
+      if @defaultprovider and @defaultprovider.name == name
+        @defaultprovider = nil
+      end
+    end
   end
 
   # Return an array of all of the suitable providers.
@@ -1571,6 +1607,7 @@ class Type
 
       # Collect the current prereqs
       list.each { |dep|
+        obj = nil
         # Support them passing objects directly, to save some effort.
         unless dep.is_a? Puppet::Type
           # Skip autorequires that we aren't managing
@@ -1890,10 +1927,18 @@ class Type
 
   def virtual?;  !!@virtual;  end
   def exported?; !!@exported; end
+
+  def appliable_to_device?
+    self.class.can_apply_to(:device)
+  end
+
+  def appliable_to_host?
+    self.class.can_apply_to(:host)
+  end
 end
 end
 
 require 'puppet/provider'
 
 # Always load these types.
-require 'puppet/type/component'
+Puppet::Type.type(:component)