puppet 0.24.4 → 0.24.5

data/lib/puppet/network/server.rb

@@ -1,3 +1,5 @@
+require 'puppet/network/http'
+
 class Puppet::Network::Server
 	attr_reader :server_type, :protocols, :address, :port
 
@@ -8,44 +10,44 @@ class Puppet::Network::Server
             raise(ArgumentError, "Must specify :address or configure Puppet :bindaddress.")
         @port = args[:port] || Puppet[:masterport] ||
             raise(ArgumentError, "Must specify :port or configure Puppet :masterport")
-	    @protocols = []
-	    @listening = false
-	    @routes = {}
-	    self.register(args[:handlers]) if args[:handlers]
+        @protocols = [ :rest ]
+        @listening = false
+        @routes = {}
+        self.register(args[:handlers]) if args[:handlers]
     end
 
     def register(*indirections)
-	    raise ArgumentError, "Indirection names are required." if indirections.empty?
-	    indirections.flatten.each { |i| @routes[i.to_sym] = true }
+  	    raise ArgumentError, "Indirection names are required." if indirections.empty?
+  	    indirections.flatten.each { |i| @routes[i.to_sym] = true }
     end
   
     def unregister(*indirections)
-        raise "Cannot unregister indirections while server is listening." if listening?
-	    indirections = @routes.keys if indirections.empty?
-	    
-	    indirections.flatten.each do |i|
-	        raise(ArgumentError, "Indirection [%s] is unknown." % i) unless @routes[i.to_sym]
-        end
+          raise "Cannot unregister indirections while server is listening." if listening?
+          indirections = @routes.keys if indirections.empty?
+
+          indirections.flatten.each do |i|
+    	        raise(ArgumentError, "Indirection [%s] is unknown." % i) unless @routes[i.to_sym]
+          end
         
-        indirections.flatten.each do |i|
-	        @routes.delete(i.to_sym)
-	    end
+          indirections.flatten.each do |i|
+    	        @routes.delete(i.to_sym)
+    	    end
     end
 
     def listening?
-	    @listening
+  	    @listening
     end
   
     def listen
-	    raise "Cannot listen -- already listening." if listening?
-	    http_server.listen(@routes.dup)
-	    @listening = true
+  	    raise "Cannot listen -- already listening." if listening?
+  	    @listening = true
+  	    http_server.listen(:address => address, :port => port, :handlers => @routes.keys, :protocols => protocols)
     end
   
     def unlisten
-	    raise "Cannot unlisten -- not currently listening." unless listening?
-	    http_server.unlisten   
-	    @listening = false
+  	    raise "Cannot unlisten -- not currently listening." unless listening?
+  	    http_server.unlisten   
+  	    @listening = false
     end
     
     def http_server_class

data/lib/puppet/network/xmlrpc/client.rb

@@ -49,6 +49,11 @@ module Puppet::Network
                             self.recycle_connection
                             retry
                         end
+                        ["certificate verify failed", "hostname was not match", "hostname not match"].each do |str|
+                            if detail.message.include?(str)
+                                Puppet.warning "Certificate validation failed; considering using the certname configuration option"
+                            end
+                        end 
                         raise XMLRPCClientError,
                             "Certificates were not trusted: %s" % detail
                     rescue ::XMLRPC::FaultException => detail
@@ -118,7 +123,7 @@ module Puppet::Network
                 nil, # user
                 nil, # password
                 true, # use_ssl
-                120 # a two minute timeout, instead of 30 seconds
+                Puppet[:configtimeout] # use configured timeout (#1176)
             )
             @http = Puppet::Network::HttpPool.http_instance(@host, @port)
         end

data/lib/puppet/node.rb

@@ -13,85 +13,7 @@ class Puppet::Node
     indirects :node, :terminus_setting => :node_terminus, :doc => "Where to find node information.
         A node is composed of its name, its facts, and its environment."
 
-    # Retrieve a node from the node source, with some additional munging
-    # thrown in for kicks.
-    def self.find_by_any_name(key)
-        return nil unless key
-
-        facts = node_facts(key)
-        node = nil
-        names = node_names(key, facts)
-        names.each do |name|
-            name = name.to_s if name.is_a?(Symbol)
-            break if node = find(name)
-        end
-
-        # If they made it this far, we haven't found anything, so look for a
-        # default node.
-        unless node or names.include?("default")
-            if node = find("default")
-                Puppet.notice "Using default node for %s" % key
-            end
-        end
-
-        if node
-            node.names = names
-
-            return node
-        else
-            return nil
-        end
-    end
-
-    private
-
-    # Look up the node facts so we can generate the node names to use.
-    def self.node_facts(key)
-        if facts = Puppet::Node::Facts.find(key)
-            facts.values
-        else
-            {}
-        end
-    end
-
-    # Calculate the list of node names we should use for looking
-    # up our node.
-    def self.node_names(key, facts = nil)
-        facts ||= node_facts(key)
-        names = []
-
-        if hostname = facts["hostname"]
-            unless hostname == key
-                names << hostname
-            end
-        else
-            hostname = key
-        end
-
-        if fqdn = facts["fqdn"]
-            hostname = fqdn
-            names << fqdn
-        end
-
-        # Make sure both the fqdn and the short name of the
-        # host can be used in the manifest
-        if hostname =~ /\./
-            names << hostname.sub(/\..+/,'')
-        elsif domain = facts['domain']
-            names << hostname + "." + domain
-        end
-
-        # Sort the names inversely by name length.
-        names.sort! { |a,b| b.length <=> a.length }
-
-        # And make sure the key is first, since that's the most
-        # likely usage.
-        ([key] + names).uniq
-    end
-
-    public
-
-    attr_accessor :name, :classes, :parameters, :source, :ipaddress, :names
+    attr_accessor :name, :classes, :parameters, :source, :ipaddress
     attr_reader :time
 
     # Set the environment, making sure that it's valid.
@@ -153,6 +75,8 @@ class Puppet::Node
     def fact_merge
         if facts = Puppet::Node::Facts.find(name)
             merge(facts.values)
+        else
+            Puppet.warning "Could not find facts for %s; you probably have a discrepancy between the node and fact names" % name
         end
     end
 
@@ -162,4 +86,39 @@ class Puppet::Node
             @parameters[name] = value unless @parameters.include?(name)
         end
     end
+
+    # Calculate the list of names we might use for looking
+    # up our node.  This is only used for AST nodes.
+    def names
+        names = []
+
+        # First, get the fqdn
+        unless fqdn = parameters["fqdn"]
+            if domain = parameters["domain"]
+                fqdn = parameters["hostname"] + "." + parameters["domain"]
+            end
+        end
+
+        # Now that we (might) have the fqdn, add each piece to the name
+        # list to search, in order of longest to shortest.
+        if fqdn
+            list = fqdn.split(".")
+            tmp = []
+            list.each_with_index do |short, i|
+                tmp << list[0..i].join(".")
+            end
+            names += tmp.reverse
+        end
+
+        # And make sure the node name is first, since that's the most
+        # likely usage.
+        #   The name is usually the Certificate CN, but it can be
+        # set to the 'facter' hostname instead.
+        if Puppet[:node_name] == 'cert'
+            names.unshift name
+        else
+            names.unshift parameters["hostname"]
+        end
+        names.uniq
+    end
 end

data/lib/puppet/node/catalog.rb

@@ -88,6 +88,12 @@ class Puppet::Node::Catalog < Puppet::PGraph
         resource.ref =~ /^(.+)\[/
 
         newref = "%s[%s]" % [$1 || resource.class.name, name]
+
+        # LAK:NOTE It's important that we directly compare the references,
+        # because sometimes an alias is created before the resource is
+        # added to the catalog, so comparing inside the below if block
+        # isn't sufficient.
+        return if newref == resource.ref
         if existing = @resource_table[newref]
             return if existing == resource
             raise(ArgumentError, "Cannot alias %s to %s; resource %s already exists" % [resource.ref, name, newref])
@@ -483,6 +489,9 @@ class Puppet::Node::Catalog < Puppet::PGraph
             if resource.is_a?(Puppet::TransObject)
                 resource = resource.dup
                 resource.catalog = result
+            elsif resource.is_a?(Puppet::Parser::Resource)
+                resource = resource.to_transobject
+                resource.catalog = result
             end
 
             newres = resource.send(convert)

data/lib/puppet/node/facts.rb

@@ -8,8 +8,16 @@ class Puppet::Node::Facts
     # the node sources.
     extend Puppet::Indirector
 
+    # We want to expire any cached nodes if the facts are saved.
+    module NodeExpirer
+        def save(instance, *args)
+            Puppet::Node.expire(instance.name)
+            super
+        end
+    end
+
     # Use the node source as the indirection terminus.
-    indirects :facts, :terminus_class => :facter
+    indirects :facts, :terminus_class => :facter, :extend => NodeExpirer
 
     attr_accessor :name, :values
 

data/lib/puppet/parser/ast/function.rb

@@ -42,7 +42,7 @@ class Puppet::Parser::AST
                 raise Puppet::DevError, "Invalid function type %s" % @ftype.inspect
             end
 
-            # Lastly, check the arity
+            # Lastly, check the parity
         end
     end
 end

data/lib/puppet/parser/collector.rb

@@ -6,6 +6,12 @@ class Puppet::Parser::Collector
     # Call the collection method, mark all of the returned objects as non-virtual,
     # and then delete this object from the list of collections to evaluate.
     def evaluate
+        # Shortcut if we're not using storeconfigs and they're trying to collect
+        # exported resources.
+        if form == :exported and Puppet[:storeconfigs] != true
+            Puppet.warning "Not collecting exported resources without storeconfigs"
+            return false
+        end
         if self.resources
             if objects = collect_resources and ! objects.empty?
                 return objects

data/lib/puppet/parser/compiler.rb

@@ -332,7 +332,7 @@ class Puppet::Parser::Compiler
 
         unless remaining.empty?
             fail Puppet::ParseError,
-                "Could not find object(s) %s" % remaining.collect { |o|
+                "Could not find resource(s) %s for overriding" % remaining.collect { |o|
                     o.ref
                 }.join(", ")
         end

data/lib/puppet/parser/functions.rb

@@ -165,7 +165,7 @@ module Functions
     type is defined, either as a native type or a defined type, or whether a class is defined.
     This is useful for checking whether a class is defined and only including it if it is.
     This function can also test whether a resource has been defined, using resource references
-    (e.g., ``if defined(File['/tmp/myfile'] { ... }``).  This function is unfortunately
+    (e.g., ``if defined(File['/tmp/myfile']) { ... }``).  This function is unfortunately
     dependent on the parse order of the configuration when testing whether a resource is defined.") do |vals|
         result = false
         vals.each do |val|
@@ -188,6 +188,22 @@ module Functions
         result
     end
 
+    newfunction(:fqdn_rand, :type => :rvalue, :doc => "Generates random 
+    numbers based on the node's fqdn. The first argument sets the range.
+    The second argument specifies a number to add to the seed and is
+    optional.") do |args|
+	require 'md5'
+	max = args[0] 
+	if args[1] then
+	     seed = args[1]
+	else
+	     seed = 1
+	end
+	fqdn_seed = MD5.new(lookupvar('fqdn')).to_s.hex
+	srand(seed+fqdn_seed)
+	rand(max).to_s
+    end 
+
     newfunction(:fail, :doc => "Fail with a parse error.") do |vals|
         vals = vals.collect { |s| s.to_s }.join(" ") if vals.is_a? Array
         raise Puppet::ParseError, vals.to_s
@@ -301,6 +317,14 @@ module Functions
             end
             output
     end
+    
+    newfunction(:sha1, :type => :rvalue,
+        :doc => "Returns a SHA1 hash value from a provided string.") do |args|
+            require 'sha1'
+
+            Digest::SHA1.hexdigest(args[0])
+    end
+
 end
 end
 

data/lib/puppet/parser/interpreter.rb

@@ -50,23 +50,8 @@ class Puppet::Parser::Interpreter
     # Return the parser for a specific environment.
     def parser(environment)
         if ! @parsers[environment] or @parsers[environment].reparse?
-            # This will throw an exception if it does not succeed.  We only
-            # want to get rid of the old parser if we successfully create a new
-            # one.
-            begin
-                tmp = create_parser(environment)
-                @parsers[environment].clear if @parsers[environment]
-                @parsers[environment] = tmp
-            rescue => detail
-                # If a parser already exists, than assume that we logged the
-                # exception elsewhere and reuse the parser.  If one doesn't
-                # exist, then reraise.
-                if @parsers[environment]
-                    Puppet.err detail
-                else
-                    raise detail
-                end
-            end
+            # This will throw an exception if it does not succeed.
+            @parsers[environment] = create_parser(environment)
         end
         @parsers[environment]
     end

data/lib/puppet/parser/parser.rb

@@ -29,7 +29,7 @@ module Puppet
 
     class Parser < Racc::Parser
 
-module_eval <<'..end grammar.ra modeval..idfef5d70c9f', 'grammar.ra', 638
+module_eval <<'..end grammar.ra modeval..id9145566289', 'grammar.ra', 638
 
 # It got too annoying having code in a file that needs to be compiled.
 require 'puppet/parser/parser_support'
@@ -41,7 +41,7 @@ require 'puppet/parser/parser_support'
 
 # $Id$
 
-..end grammar.ra modeval..idfef5d70c9f
+..end grammar.ra modeval..id9145566289
 
 ##### racc 1.4.5 generates ###
 
@@ -958,7 +958,7 @@ module_eval <<'.,.,', 'grammar.ra', 174
     type = val[0]
 
     if (type == :exported and ! Puppet[:storeconfigs]) and ! Puppet[:parseonly]
-        error "You cannot collect without storeconfigs being set"
+        Puppet.warning addcontext("You cannot collect without storeconfigs being set")
     end
 
     if val[1].is_a? AST::ResourceDefaults
@@ -1011,7 +1011,7 @@ module_eval <<'.,.,', 'grammar.ra', 199
         args[:form] = val[1]
     end
     if args[:form] == :exported and ! Puppet[:storeconfigs] and ! Puppet[:parseonly]
-        error "You cannot collect exported resources without storeconfigs being set"
+        Puppet.warning addcontext("You cannot collect exported resources without storeconfigs being set; the collection will be ignored")
     end
     result = ast AST::Collection, args
    result

data/lib/puppet/parser/parser_support.rb

@@ -237,7 +237,9 @@ class Puppet::Parser::Parser
             end
         end
 
-        return true if classes.include?(classname)
+        # We don't know whether we're looking for a class or definition, so we have
+        # to test for both.
+        return true if classes.include?(classname) || definitions.include?(classname)
 
         unless @loaded.include?(filename)
             @loaded << filename
@@ -249,7 +251,9 @@ class Puppet::Parser::Parser
                 # We couldn't load the file
             end
         end
-        return classes.include?(classname)
+        # We don't know whether we're looking for a class or definition, so we have
+        # to test for both.
+        return classes.include?(classname) || definitions.include?(classname)
     end
 
     # Split an fq name into a namespace and name

data/lib/puppet/parser/resource.rb

@@ -303,6 +303,12 @@ class Puppet::Parser::Resource
         return bucket
     end
 
+    # Convert this resource to a RAL resource.  We hackishly go via the
+    # transportable stuff.
+    def to_type
+        to_trans.to_type
+    end
+
     def to_transobject
         # Now convert to a transobject
         obj = Puppet::TransObject.new(@ref.title, @ref.type)