puppet 0.25.1 → 0.25.2

data/conf/redhat/server.init

@@ -13,6 +13,7 @@ PATH=/usr/bin:/sbin:/bin:/usr/sbin
 export PATH
 
 lockfile=/var/lock/subsys/puppetmaster
+pidfile=/var/run/puppet/puppetmasterd.pid
 
 # Source function library.
 . /etc/rc.d/init.d/functions

data/conf/redhat/server.sysconfig

@@ -28,4 +28,4 @@
 #PUPPETMASTER_PORTS=( 18140 18141 18142 18143 )
 
 # You may specify other parameters to the puppetmaster here
-#PUPPETMASTER_EXTRA_OPTS=--noca
+#PUPPETMASTER_EXTRA_OPTS=--no-ca

data/ext/ldap/puppet.schema

@@ -1,28 +1,24 @@
-# These OIDs are all fake.  No guarantees there won't be conflicts.
-#
-# $Id$
-
-attributetype ( 1.1.3.10 NAME 'puppetclass'
+attributetype (  1.3.6.1.4.1.34380.1.1.3.10 NAME 'puppetClass'
 	DESC 'Puppet Node Class'
 	EQUALITY caseIgnoreIA5Match
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
 
-attributetype ( 1.1.3.9 NAME 'parentnode'
+attributetype ( 1.3.6.1.4.1.34380.1.1.3.9 NAME 'parentNode'
 	DESC 'Puppet Parent Node'
 	EQUALITY caseIgnoreIA5Match
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
         SINGLE-VALUE )
 
-attributetype ( 1.1.3.11 NAME 'environment'
+attributetype ( 1.3.6.1.4.1.34380.1.1.3.11 NAME 'environment'
 	DESC 'Puppet Node Environment'
 	EQUALITY caseIgnoreIA5Match
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
 
-attributetype ( 1.1.3.12 NAME 'puppetvar'
+attributetype ( 1.3.6.1.4.1.34380.1.1.3.12 NAME 'puppetVar'
 	DESC 'A variable setting for puppet'
 	EQUALITY caseIgnoreIA5Match
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
 
-objectclass ( 1.1.1.2 NAME 'puppetClient' SUP top AUXILIARY
+objectclass ( 1.3.6.1.4.1.34380.1.1.1.2 NAME 'puppetClient' SUP top AUXILIARY
 	DESC 'Puppet Client objectclass'
 	MAY ( puppetclass $ parentnode $ environment $ puppetvar ))

data/ext/puppetlast

@@ -4,6 +4,7 @@
 # AJ "Fujin" Christensen <aj@junglist.gen.nz>
 #
 require 'puppet'
+require 'time'
 
 Puppet[:config] = "/etc/puppet/puppet.conf"
 Puppet.parse_config
@@ -11,5 +12,5 @@ Puppet[:name] = "puppetmasterd"
 Puppet::Node::Facts.terminus_class = :yaml
 
 Puppet::Node::Facts.search("*").sort { |a,b| a.name <=> b.name }.each do |node|
-  puts "#{node.name} #{node.expired? ? 'cached expired, ' : ''}checked in #{((Time.now - node.values[:_timestamp]) / 60).floor} minutes ago"
+  puts "#{node.name} #{node.expired? ? 'cached expired, ' : ''}checked in #{((Time.now - Time.parse(node.values[:_timestamp])) / 60).floor} minutes ago"
 end

data/ext/rack/README

@@ -43,7 +43,7 @@ Make sure puppetmasterd ran at least once, so the CA & SSL certificates
 got set up.
 
 Requirements:
-  Passenger version 2.2.2 or newer***
+  Passenger version 2.2.2 or 2.2.5 or newer***
   Rack version 1.0.0
   Apache 2.x
   SSL Module loaded
@@ -68,6 +68,6 @@ config.ru. Therefore, config.ru shall be owned by the puppet user.
 *** Important note about Passenger versions:
     2.2.2 is known to work.
     2.2.3-2.2.4 are known to *NOT* work.
-    2.2.5 (when it is released) is expected to work properly again.
+    2.2.5 works again when used with Puppet 0.25.2+.
     Passenger installation doc: http://www.modrails.com/install.html
 

data/ext/regexp_nodes/classes/databases

@@ -0,0 +1,2 @@
+db\d{2}
+mysql

data/ext/regexp_nodes/classes/webservers

@@ -0,0 +1,2 @@
+^(web|www)
+leterel

data/ext/regexp_nodes/parameters/environment/prod

@@ -0,0 +1 @@
+\d{3}$

data/ext/regexp_nodes/parameters/environment/qa

@@ -0,0 +1,3 @@
+^qa-
+^qa2-
+^qa3-

data/ext/regexp_nodes/regexp_nodes.rb

@@ -0,0 +1,215 @@
+#!/usr/bin/env ruby
+
+# = Synopsis
+# This is an external node classifier script, after
+# http://reductivelabs.com/trac/puppet/wiki/ExternalNodes
+#
+# = Usage
+# regexp_nodes.rb <host>
+#
+# = Description
+# This classifier implements filesystem autoloading: It looks through classes
+# and parameters subdirectories, looping through each file it finds there - the
+# contents are a regexp-per-line which, if they match the hostname passed us as
+# ARGV[0], will cause a class or parameter named the same thing as the file to
+# be set.
+#
+# = Examples
+# In the distribution there are two subdirectories test_classes/ and
+# test_parameters, which are passed as parameters to MyExternalNode.new.
+# test_classes/database will set the 'database' class for any hostnames
+# matching %r{db\d{2}} (that is, 'db' followed by two digits) or with 'mysql'
+# anywhere in the hostname.  Similarly, hosts beginning with 'www' or 'web'
+# or the hostname 'leterel' (my workstation) will be assigned the 'webserver'
+# class.
+#
+# Under test_parameters/ there is one subdirectory 'environment' which
+# sets the a parameter called 'environment' to the value 'prod' for production
+# hosts (whose hostnames always end with three numbers for us), 'qa' for
+# anything that starts with 'qa-' 'qa2-' or 'qa3-', and 'sandbox' for any
+# development machines which are, naturally, named after Autechre songs.
+#
+#
+# = Author
+# Eric Sorenson <esorenson@apple.com>
+
+
+# we need yaml or there's not much point in going on
+require 'yaml'
+
+# Sets are like arrays but automatically de-duplicate elements
+require 'set'
+
+# set up some nice logging
+require 'logger'
+# XXX flip this for production vs local sandbox
+# $LOG = Logger.new("/var/puppet/log/extnodes.log")
+# $LOG.level = Logger::FATAL
+$LOG = Logger.new($stderr)
+$LOG.level = Logger::DEBUG
+
+# paths for files we use will be relative to this directory
+# XXX flip this for production vs local sandbox
+# WORKINGDIR = "/var/puppet/bin"
+WORKINGDIR = Dir.pwd
+
+# This class holds all the methods for creating and accessing the properties
+# of an external node. There are really only two public methods: initialize()
+# and a special version of to_yaml()
+
+class ExternalNode
+    # Make these instance variables get/set-able with eponymous methods
+    attr_accessor :classes, :parameters, :hostname
+
+    # initialize() takes three arguments:
+    # hostname:: usually passed in via ARGV[0] but it could be anything
+    # classdir:: directory under WORKINGDIR to look for files named after
+    # classes
+    # parameterdir:: directory under WORKINGDIR to look for directories to set
+    # parameters
+    def initialize(hostname, classdir = 'classes/', parameterdir = 'parameters/')
+        # instance variables that contain the lists of classes and parameters
+        @hostname
+        @classes = Set.new ["baseclass"]
+        @parameters = Hash.new("unknown")    # sets a default value of "unknown"
+
+        self.parse_argv(hostname)
+        self.match_classes(WORKINGDIR + "/" + classdir)
+        self.match_parameters(WORKINGDIR + "/" + parameterdir)
+    end
+
+    # private method called by initialize() which sanity-checks our hostname.
+    # good candidate for overriding in a subclass if you need different checks
+    def parse_argv(hostname)
+        if hostname =~ /^([-\w]+?)\.([-\w\.]+)/    # non-greedy up to the first . is hostname
+            @hostname = $1
+        elsif hostname =~ /^([-\w]+)$/       # sometimes puppet's @name is just a name
+            @hostname = hostname
+        else
+            $LOG.fatal("didn't receive parsable hostname, got: [#{hostname}]")
+            exit(1)
+        end
+    end
+
+    # to_yaml massages a copy of the object and outputs clean yaml so we don't
+    # feed weird things back to puppet []<
+    def to_yaml
+        classes = self.classes.to_a
+        if self.parameters.empty? # otherwise to_yaml prints "parameters: {}"
+             parameters = nil
+        else
+             parameters = self.parameters
+        end
+        ({ 'classes' => classes, 'parameters' => parameters}).to_yaml
+    end
+
+    # Private method that expects an absolute path to a file and a string to
+    # match - it returns true if the string was matched by any of the lines in
+    # the file
+    def matched_in_patternfile?(filepath, matchthis)
+
+        patternlist = []
+
+        begin
+            open(filepath).each { |l|
+                pattern = %r{#{l.chomp!}}
+                patternlist <<  pattern
+                $LOG.debug("appending [#{pattern}] to patternlist for [#{filepath}]")
+            }
+        rescue Exception
+            $LOG.fatal("Problem reading #{filepath}: #{$!}")
+            exit(1)
+        end
+
+        $LOG.debug("list of patterns for #{filepath}: #{patternlist}")
+
+        if matchthis =~ Regexp.union(patternlist)
+            $LOG.debug("matched #{$~.to_s} in #{matchthis}, returning true")
+            return true
+
+        else    # hostname didn't match anything in patternlist
+            $LOG.debug("#{matchthis} unmatched, returning false")
+            return nil
+        end
+
+    end # def
+
+    # private method - takes a path to look for files, iterates through all
+    # readable, regular files it finds, and matches this instance's @hostname
+    # against each line; if any match, the class will be set for this node.
+    def match_classes(fullpath)
+        Dir.foreach(fullpath) do |patternfile|
+            filepath = "#{fullpath}/#{patternfile}"
+            next unless File.file?(filepath) and
+                File.readable?(filepath)
+            $LOG.debug("Attempting to match [#{@hostname}] in [#{filepath}]")
+            if matched_in_patternfile?(filepath,@hostname)
+                @classes << patternfile.to_s
+                $LOG.debug("Appended #{patternfile.to_s} to classes instance variable")
+            end # if
+        end # Dir.foreach
+    end # def
+
+    # Parameters are handled slightly differently; we make another level of
+    # directories to get the parameter name, then use the names of the files
+    # contained in there for the values of those parameters.
+    #
+    # ex: cat /var/puppet/bin/parameters/environment/production
+    # ^prodweb
+    # would set parameters["environment"] = "production" for prodweb001
+    def match_parameters(fullpath)
+        Dir.foreach(fullpath) do |parametername|
+
+            filepath = "#{fullpath}/#{parametername}"
+            next if File.basename(filepath) =~ /^\./     # skip over dotfiles
+
+            next unless File.directory?(filepath) and
+                        File.readable?(filepath)        # skip over non-directories
+
+            $LOG.debug "Considering contents of #{filepath}"
+
+            Dir.foreach("#{filepath}") do |patternfile|
+                secondlevel = "#{filepath}/#{patternfile}"
+                $LOG.debug "Found parameters patternfile at #{secondlevel}"
+                next unless File.file?(secondlevel) and
+                    File.readable?(secondlevel)
+                $LOG.debug("Attempting to match [#{@hostname}] in [#{secondlevel}]")
+                if matched_in_patternfile?(secondlevel, @hostname)
+                     @parameters[ parametername.to_s ] = patternfile.to_s
+                     $LOG.debug("Set @parameters[#{parametername.to_s}] = #{patternfile.to_s}")
+                end # if
+            end # Dir.foreach #{filepath}
+        end # Dir.foreach #{fullpath}
+    end # def
+
+end # Class
+
+# Logic for local hacks that don't fit neatly into the autoloading model can
+# happen as we initialize a subclass
+class MyExternalNode < ExternalNode
+
+    def initialize(hostname, classdir = 'classes/', parameterdir = 'parameters/')
+
+        super
+
+        # Set "hostclass" parameter based on hostname,
+        # stripped of leading environment prefix and numeric suffix
+        if @hostname =~ /^(\w*?)-?(\D+)(\d{2,3})$/
+            match = Regexp.last_match
+
+            hostclass = match[2]
+            $LOG.debug("matched hostclass #{hostclass}")
+            @parameters[ "hostclass" ] = hostclass
+        else
+            $LOG.debug("hostclass couldn't figure out class from #{@hostname}")
+        end # if
+    end # def
+
+end # Class
+
+
+# Here we begin actual execution by calling methods defined above
+
+mynode = MyExternalNode.new(ARGV[0], classes = 'test_classes', parameters = 'test_parameters')
+
+puts mynode.to_yaml

data/lib/puppet.rb

@@ -24,7 +24,7 @@ require 'puppet/util/suidmanager'
 # it's also a place to find top-level commands like 'debug'
 
 module Puppet
-    PUPPETVERSION = '0.25.1'
+    PUPPETVERSION = '0.25.2'
 
     def Puppet.version
         return PUPPETVERSION

data/lib/puppet/agent.rb

@@ -51,7 +51,7 @@ class Puppet::Agent
         with_client do |client|
             begin
                 sync.synchronize { lock { client.run(*args) } }
-            rescue => detail
+            rescue Exception => detail
                 puts detail.backtrace if Puppet[:trace]
                 Puppet.err "Could not run %s: %s" % [client_class, detail]
             end
@@ -122,7 +122,7 @@ class Puppet::Agent
     def with_client
         begin
             @client = client_class.new
-        rescue => detail
+        rescue Exception => detail
             puts detail.backtrace if Puppet[:trace]
             Puppet.err "Could not create instance of %s: %s" % [client_class, detail]
             return

data/lib/puppet/application/puppet.rb

@@ -49,7 +49,7 @@ Puppet::Application.new(:puppet) do
         end
 
         begin
-            catalog = PSON.parse(text)
+            catalog = Puppet::Resource::Catalog.convert_from(Puppet::Resource::Catalog.default_format,text)
             unless catalog.is_a?(Puppet::Resource::Catalog)
                 catalog = Puppet::Resource::Catalog.pson_create(catalog)
             end

data/lib/puppet/application/puppetd.rb

@@ -125,7 +125,7 @@ Puppet::Application.new(:puppetd) do
         Puppet.settings.handlearg("--no-daemonize")
         options[:verbose] = true
         options[:onetime] = true
-        options[:waitforcert] = 0
+        options[:waitforcert] = 0 unless @explicit_waitforcert
     end
 
     # Handle the logging settings.

data/lib/puppet/application/puppetdoc.rb

@@ -66,8 +66,9 @@ Puppet::Application.new(:puppetdoc) do
         exit_code = 0
         files = []
         unless @manifest
-            files += Puppet[:modulepath].split(':').collect { |p| File.expand_path(p) }
-            files += Puppet[:manifestdir].split(':').collect { |p| File.expand_path(p) }
+            env = Puppet::Node::Environment.new
+            files += env.modulepath
+            files << File.dirname(env[:manifest])
         end
         files += ARGV
         Puppet.info "scanning: %s" % files.inspect
@@ -191,7 +192,7 @@ Puppet::Application.new(:puppetdoc) do
         end
     end
 
-    def setup_rdoc
+    def setup_rdoc(dummy_argument=:work_arround_for_ruby_GC_bug)
         # consume the unknown options
         # and feed them as settings
         if @unknown_args.size > 0

data/lib/puppet/application/puppetrun.rb

@@ -1,18 +1,9 @@
-begin
-    require 'rubygems'
-rescue LoadError
-    # Nothing; we were just doing this just in case
-end
-
-begin
-    require 'ldap'
-rescue LoadError
-    $stderr.puts "Failed to load ruby LDAP library. LDAP functionality will not be available"
-end
-
 require 'puppet'
 require 'puppet/application'
 
+Puppet.warning "RubyGems not installed" unless Puppet.features.rubygems?
+Puppet.warning "Failed to load ruby LDAP library. LDAP functionality will not be available" unless Puppet.features.ldap?
+
 Puppet::Application.new(:puppetrun) do
 
     should_not_parse_config
@@ -176,12 +167,12 @@ Puppet::Application.new(:puppetrun) do
 
         if Puppet[:node_terminus] == "ldap" and (options[:all] or @classes)
             if options[:all]
-                @hosts = Puppet::Node.search("whatever").collect { |node| node.name }
+                @hosts = Puppet::Node.search("whatever", :fqdn => options[:fqdn]).collect { |node| node.name }
                 puts "all: %s" % @hosts.join(", ")
             else
                 @hosts = []
                 @classes.each do |klass|
-                    list = Puppet::Node.search("whatever", :class => klass).collect { |node| node.name }
+                    list = Puppet::Node.search("whatever", :fqdn => options[:fqdn], :class => klass).collect { |node| node.name }
                     puts "%s: %s" % [klass, list.join(", ")]
 
                     @hosts += list

data/lib/puppet/application/ralsh.rb

@@ -38,25 +38,15 @@ Puppet::Application.new(:ralsh) do
     end
 
     command(:main) do
-        if ARGV.length > 0
-            type = ARGV.shift
-        else
-            raise "You must specify the type to display"
-        end
-
-        name = nil
+        type = ARGV.shift or raise "You must specify the type to display"
+        typeobj = Puppet::Type.type(type) or raise "Could not find type #{type}"
+        name = ARGV.shift
         params = {}
-        if ARGV.length > 0
-            name = ARGV.shift
-        end
-
-        if ARGV.length > 0
-            ARGV.each do |setting|
-                if setting =~ /^(\w+)=(.+)$/
-                    params[$1] = $2
-                else
-                    raise "Invalid parameter setting %s" % setting
-                end
+        ARGV.each do |setting|
+            if setting =~ /^(\w+)=(.+)$/
+                params[$1] = $2
+            else
+                raise "Invalid parameter setting %s" % setting
             end
         end
 
@@ -64,12 +54,6 @@ Puppet::Application.new(:ralsh) do
             raise "You cannot edit a remote host"
         end
 
-        typeobj = nil
-
-        unless typeobj = Puppet::Type.type(type)
-            raise "Could not find type %s" % type
-        end
-
         properties = typeobj.properties.collect { |s| s.name }
 
         format = proc {|trans|
@@ -106,7 +90,7 @@ Puppet::Application.new(:ralsh) do
             transbucket.sort { |a,b| a.name <=> b.name }.collect(&format)
         else
             if name
-                obj = typeobj.new(:name => name, :check => properties)
+                obj = typeobj.instances.find { |o| o.name == name } || typeobj.new(:name => name, :check => properties)
                 vals = obj.retrieve
 
                 unless params.empty?