puppet 0.13.1 → 0.13.2

data/CHANGELOG

@@ -1,3 +1,7 @@
+0.13.2
+    Changed package[answerfile] to package[adminfile], and added package[responsefile]
+    Fixed a bunch of internal functions to behave more consistently and usefully
+
 0.13.1
     Fixed RPM spec files to create puppet user and group (lutter)
     Fixed crontab reading and writing (luke)

data/Rakefile

@@ -47,7 +47,7 @@ DOWNDIR = "/export/docroots/reductivelabs.com/htdocs/downloads"
 if ENV['HOSTS']
     TESTHOSTS = ENV['HOSTS'].split(/\s+/)
 else
-    TESTHOSTS = %w{fedora1 rh3a kirby culain openbsd1 centos1}
+    TESTHOSTS = %w{fedora1 rh3a culain openbsd1 centos1}
 end
 #TESTHOSTS = %w{sol10b}
 
@@ -386,8 +386,8 @@ task :hosttest do
         if $? != 0
             file = File.join("/tmp", "%stest.out" % host)
             File.open(file, "w") { |of| of.print out }
-            puts "%s failed; output is in %s" % [host, file]
             puts out
+            puts "%s failed; output is in %s" % [host, file]
         end
         #sh %{ssh #{host} 'cd #{cwd}/test; sudo ./test' 2>&1} 
     }

data/bin/puppet

@@ -27,9 +27,18 @@
 # debug::
 #   Enable full debugging.
 #
+# extclassfile::
+#   Specify the location of the class file to load.  Only affects the
+#   +--loadclasses+ option.
+#
 # help::
 #   Print this help message
 #
+# loadclasses::
+#   Load any stored classes.  +puppetd+ caches configured classes (usually at
+#   /etc/puppet/classes.txt), and setting this option causes all of those classes
+#   to be set in your +puppet+ manifest.
+#
 # logfile::
 #   Where to send messages.  Choose between syslog, the console, and a log file.
 #   Defaults to sending messages to the console.
@@ -65,8 +74,10 @@ end
 
 options = [
     [ "--debug",	"-d",			GetoptLong::NO_ARGUMENT ],
+    [ "--extclassfile", "-e",		GetoptLong::REQUIRED_ARGUMENT ],
     [ "--help",		"-h",			GetoptLong::NO_ARGUMENT ],
     [ "--logdest",	"-l",			GetoptLong::REQUIRED_ARGUMENT ],
+    [ "--loadclasses",				GetoptLong::NO_ARGUMENT ],
     [ "--verbose",  "-v",			GetoptLong::NO_ARGUMENT ],
     [ "--use-nodes",    			GetoptLong::NO_ARGUMENT ],
     [ "--version",  "-V",           GetoptLong::NO_ARGUMENT ]
@@ -82,6 +93,8 @@ verbose = false
 noop = false
 logfile = false
 parseonly = false
+loadclasses = false
+classfile = nil
 
 master = {
     :Local => true
@@ -108,6 +121,10 @@ begin
                 verbose = true
             when "--debug"
                 debug = true
+            when "--extclassfile"
+                classfile = arg
+            when "--loadclasses"
+                loadclasses = true
             when "--logdest"
                 begin
                     Puppet::Log.newdestination(arg)
@@ -142,6 +159,18 @@ Puppet.genmanifest
 
 master[:File] = ARGV.shift
 
+if loadclasses
+    file = classfile || Puppet[:classfile]
+    if FileTest.exists?(file)
+        unless FileTest.readable?(file)
+            $stderr.puts "%s is not readable" % file
+            exit(63)
+        end
+
+        master[:Classes] = File.read(file).split(/[\s\n]/)
+    end
+end
+
 begin
     server = Puppet::Server::Master.new(master)
     client = Puppet::Client::MasterClient.new(

data/bin/puppetd

@@ -37,9 +37,24 @@
 #   Send all produced logs to the central puppetmasterd system.  This currently
 #   results in a significant slowdown, so it is not recommended.
 #
+# disable::
+#   Disable working on the local system.  This puts a lock file in place,
+#   causing +puppetd+ not to work on the system until the lock file is removed.
+#   This is useful if you are testing a configuration and do not want the central
+#   configuration to override the local state until everything is tested and
+#   committed.
+#
+#   +puppetd+ exits after executing this.
+#
 # debug::
 #   Enable full debugging.
 #
+# enable::
+#   Enable working on the local system.  This removes any lock file, causing
+#   +puppetd+ to start managing the local system again.
+#
+#   +puppetd+ exits after executing this.
+#
 # fqdn::
 #   Set the fully-qualified domain name of the client.  This is only used for
 #   certificate purposes, but can be used to override the discovered hostname.
@@ -95,7 +110,9 @@ end
 
 options = [
 	[ "--centrallogging",			GetoptLong::NO_ARGUMENT ],
+	[ "--disable",	    			GetoptLong::NO_ARGUMENT ],
 	[ "--debug",	"-d",			GetoptLong::NO_ARGUMENT ],
+	[ "--enable",	    			GetoptLong::NO_ARGUMENT ],
 	[ "--fqdn",     "-f",			GetoptLong::REQUIRED_ARGUMENT ],
 	[ "--help",		"-h",			GetoptLong::NO_ARGUMENT ],
 	[ "--logdest",	"-l",			GetoptLong::REQUIRED_ARGUMENT ],
@@ -122,11 +139,18 @@ centrallogs = false
 
 setdest = false
 
+enable = false
+disable = false
+
 begin
     result.each { |opt,arg|
         case opt
             # First check to see if the argument is a valid configuration parameter;
             # if so, set it.
+            when "--disable"
+                disable = true
+            when "--enable"
+                enable = true
             when "--centrallogging"
                 centrallogs = true
             when "--help"
@@ -209,6 +233,16 @@ end
 Puppet.notice "Starting Puppet client version %s" % [Puppet.version]
 client = Puppet::Client::MasterClient.new(args)
 
+if enable
+    client.enable
+elsif disable
+    client.disable
+end
+
+if enable or disable
+    exit(0)
+end
+
 unless client.readcert
     if waitforcert
         begin
@@ -264,4 +298,4 @@ else
     Puppet.start
 end
 
-# $Id: puppetd 895 2006-02-09 21:15:38Z lutter $
+# $Id: puppetd 908 2006-02-14 00:14:56Z luke $

data/conf/redhat/puppet.spec

@@ -4,7 +4,7 @@
 
 Summary: A network tool for managing many disparate systems
 Name: puppet
-Version: 0.13.1
+Version: 0.13.2
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base

data/lib/puppet.rb

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

data/lib/puppet/client/master.rb

@@ -1,5 +1,10 @@
 # The client for interacting with the puppetmaster config server.
 class Puppet::Client::MasterClient < Puppet::Client
+    Puppet.setdefaults("puppetd",
+        [:puppetdlockfile, "$statedir/puppetdlock",
+            "A lock file to temporarily stop puppetd from doing anything."]
+    )
+
     @drivername = :Master
 
     def self.facts
@@ -79,6 +84,19 @@ class Puppet::Client::MasterClient < Puppet::Client
         @cachefile
     end
 
+    # Disable running the configuration.
+    def disable
+        Puppet.notice "Disabling puppetd"
+        unless FileTest.exists? File.dirname(Puppet[:puppetdlockfile])
+            Puppet.recmkdir(File.dirname(Puppet[:puppetdlockfile]))
+        end
+        begin
+            File.open(Puppet[:puppetdlockfile], "w") { |f| f.puts ""; f.flush }
+        rescue => detail
+            raise Puppet::Error, "Could not lock puppetd: %s" % detail
+        end
+    end
+
     # Initialize and load storage
     def dostorage
         begin
@@ -96,6 +114,14 @@ class Puppet::Client::MasterClient < Puppet::Client
         end
     end
 
+    # Enable running again.
+    def enable
+        Puppet.notice "Enabling puppetd"
+        if FileTest.exists? Puppet[:puppetdlockfile]
+            File.unlink(Puppet[:puppetdlockfile])
+        end
+    end
+
     # Check whether our configuration is up to date
     def fresh?
         unless defined? @configstamp
@@ -227,8 +253,13 @@ class Puppet::Client::MasterClient < Puppet::Client
 
     # The code that actually runs the configuration.  
     def run
-        self.getconfig
-        self.apply
+        if FileTest.exists? Puppet[:puppetdlockfile]
+            Puppet.notice "%s exists; skipping configuration run" %
+                Puppet[:puppetdlockfile]
+        else
+            self.getconfig
+            self.apply
+        end
     end
 
     def setclasses(ary)
@@ -243,4 +274,4 @@ class Puppet::Client::MasterClient < Puppet::Client
     end
 end
 
-# $Id: master.rb 872 2006-02-07 17:07:15Z luke $
+# $Id: master.rb 908 2006-02-14 00:14:56Z luke $

data/lib/puppet/filetype.rb

@@ -40,7 +40,11 @@ module Puppet
                     begin
                         val = real_read()
                         @loaded = Time.now
-                        return val.gsub(/# HEADER.*\n/,'')
+                        if val
+                            return val.gsub(/# HEADER.*\n/,'')
+                        else
+                            return ""
+                        end
                     rescue Puppet::Error => detail
                         raise
                     rescue => detail
@@ -204,4 +208,4 @@ module Puppet
     end
 end
 
-# $Id: filetype.rb 898 2006-02-13 17:13:09Z luke $
+# $Id: filetype.rb 910 2006-02-15 07:20:36Z luke $

data/lib/puppet/networkclient.rb

@@ -68,6 +68,9 @@ module Puppet
                             Puppet.err "Could not call %s.%s: %s" %
                                 [namespace, method, detail.inspect]
                             #raise NetworkClientError.new(detail.to_s)
+                            if Puppet[:debug]
+                                puts detail.backtrace
+                            end
                             raise
                         end
                     }
@@ -142,4 +145,4 @@ module Puppet
     end
 end
 
-# $Id: networkclient.rb 856 2006-01-30 16:18:24Z luke $
+# $Id: networkclient.rb 914 2006-02-15 21:04:14Z luke $

data/lib/puppet/parameter.rb

@@ -11,14 +11,18 @@ module Puppet
                 if block
                     define_method(:default, &block)
                 else
+                    if value.nil?
+                        raise Puppet::DevError,
+                            "Either a default value or block must be provided"
+                    end
                     define_method(:default) do value end
                 end
             end
 
             def nodefault
-                undef_method :default
-                #if defined_method? :default
-                #end
+                if public_method_defined? :default
+                    undef_method :default
+                end
             end
 
             # Store documentation for this parameter.
@@ -42,6 +46,9 @@ module Puppet
                         Puppet.debug "Reraising %s" % detail
                         raise
                     rescue => detail
+                        if Puppet[:debug]
+                            puts detail.backtrace
+                        end
                         raise Puppet::DevError, "Munging failed for class %s: %s" %
                             [self.name, detail]
                     end
@@ -101,6 +108,9 @@ module Puppet
                     rescue ArgumentError, Puppet::Error, TypeError
                         raise
                     rescue => detail
+                        if Puppet[:debug]
+                            puts detail.backtrace
+                        end
                         raise Puppet::DevError,
                             "Validate method failed for class %s: %s" %
                             [self.name, detail]
@@ -142,7 +152,13 @@ module Puppet
                 @aliasvalues ||= {}
 
                 #[@aliasvalues.keys, @parametervalues.keys].flatten
-                @parametervalues.dup
+                if @parametervalues.is_a? Array
+                    return @parametervalues.dup
+                elsif @parametervalues.is_a? Hash
+                    return @parametervalues.keys
+                else
+                    return []
+                end
             end
         end
 
@@ -159,36 +175,6 @@ module Puppet
 
         attr_accessor :parent
 
-        # This doesn't work, because the instance_eval doesn't bind the inner block
-        # only the outer one.
-#        def munge(value)
-#            if munger = self.class.munger
-#                return @parent.instance_eval {
-#                    munger.call(value)
-#                }
-#            else
-#                return value
-#            end
-#        end
-#
-#        def validate(value)
-#            if validater = self.class.validater
-#                return @parent.instance_eval {
-#                    validater.call(value)
-#                }
-#            end
-#        end
-
-        #def default
-        #    default = self.class.default
-        #    if default.is_a?(Proc)
-        #        val = self.instance_eval(&default)
-        #        return val
-        #    else
-        #        return default
-        #    end
-        #end
-
         def devfail(msg)
             self.fail(Puppet::DevError, msg)
         end
@@ -273,16 +259,17 @@ module Puppet
 
         # Verify that the passed value is valid.
         validate do |value|
-            if self.class.values.empty?
+            values = self.class.values
+            if values.empty?
                 # This parameter isn't using defined values to do its work.
                 return 
             end
             unless value.is_a?(Symbol)
                 value = value.to_s.intern
             end
-            unless self.class.values.include?(value) or self.class.alias(value)
+            unless values.include?(value) or self.class.alias(value)
                 self.fail "Invalid '%s' value '%s'.  Valid values are '%s'" %
-                        [self.class.name, value, self.class.values.join(", ")]
+                        [self.class.name, value, values.join(", ")]
             end
         end
 
@@ -290,7 +277,17 @@ module Puppet
         # it possible to call for states, too.
         def value
             if self.is_a?(Puppet::State)
-                return self.should
+                # We should return the 'is' value if there's not 'should' value.
+                # This might be bad, though, because the 'should' method
+                # knows whether to return an array or not and that info is
+                # not exposed, and the 'is' value could be a symbol.  I can't
+                # seem to create a test in which this is a problem, but that doesn't
+                # mean it's not one.
+                if self.should
+                    return self.should
+                else
+                    return self.is
+                end
             else
                 if defined? @value
                     return @value

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

@@ -48,6 +48,7 @@ class Puppet::Parser::AST
         # Evaluate our parent class.
         def evalparent(scope)
             if @parentclass
+                Puppet.warning "evaluating parent %s" % @parentclass
                 # This is pretty messed up.  I don't know if this will
                 # work in the long term, but we need to evaluate the node
                 # in our own scope, even though our parent node has

data/lib/puppet/parser/interpreter.rb

@@ -10,6 +10,32 @@ require 'puppet/parser/scope'
 module Puppet
     module Parser
         class Interpreter
+            Puppet.setdefaults("ldap",
+                [:ldapnodes, false,
+                    "Whether to search for node configurations in LDAP."],
+                [:ldapserver, "ldap",
+                    "The LDAP server.  Only used if ``ldapnodes`` is enabled."],
+                [:ldapport, 389,
+                    "The LDAP port.  Only used if ``ldapnodes`` is enabled."],
+                [:ldapstring, "(&(objectclass=puppetClient)(cn=%s))",
+                    "The search string used to find an LDAP node."],
+                [:ldapattrs, "puppetclass",
+                    "The LDAP attributes to use to define Puppet classes.  Values
+                    should be comma-separated."],
+                [:ldapparentattr, "parentnode",
+                    "The attribute to use to define the parent node."],
+                [:ldapuser, "",
+                    "The user to use to connect to LDAP.  Must be specified as a
+                    full DN."],
+                [:ldappassword, "",
+                    "The password to use to connect to LDAP."],
+                [:ldapbase, "",
+                    "The search base for LDAP searches.  It's impossible to provide
+                    a meaningful default here, although the LDAP libraries might
+                    have one already set.  Generally, it should be the 'ou=Hosts'
+                    branch under your main directory."]
+            )
+
             attr_accessor :ast, :filetimeout
             # just shorten the constant path a bit, using what amounts to an alias
             AST = Puppet::Parser::AST
@@ -31,6 +57,20 @@ module Puppet
                     @usenodes = true
                 end
 
+                @nodesources = hash[:NodeSources] || [:file]
+
+                @nodesources.each { |source|
+                    method = "setup_%s" % source.to_s
+                    if respond_to? method
+                        begin
+                            self.send(method)
+                        rescue => detail
+                            raise Puppet::Error,
+                                "Could not set up node source %s" % source
+                        end
+                    end
+                }
+
                 # Set it to either the value or nil.  This is currently only used
                 # by the cfengine module.
                 @classes = hash[:Classes] || []
@@ -41,6 +81,77 @@ module Puppet
                 evaluate
             end
 
+            # Connect to the LDAP Server
+            def setup_ldap
+                begin
+                    require 'ldap'
+                rescue LoadError
+                    @ldap = nil
+                end
+                begin
+                    @ldap = LDAP::Conn.new(Puppet[:ldapserver], Puppet[:ldapport])
+                    @ldap.set_option(LDAP::LDAP_OPT_PROTOCOL_VERSION, 3)
+                    @ldap.simple_bind(Puppet[:ldapuser], Puppet[:ldappassword])
+                rescue => detail
+                    raise Puppet::Error, "Could not connect to LDAP: %s" % detail
+                end
+            end
+
+            # Find the ldap node and extra the info, returning just
+            # the critical data.
+            def nodesearch_ldap(node)
+                unless defined? @ldap
+                    ldapconnect()
+                end
+
+                filter = Puppet[:ldapstring]
+                attrs = Puppet[:ldapattrs].split("\s*,\s*")
+                sattrs = attrs.dup
+                pattr = nil
+                if pattr = Puppet[:ldapparentattr]
+                    if pattr == ""
+                        pattr = nil
+                    else
+                        sattrs << pattr
+                    end
+                end
+
+                if filter =~ /%s/
+                    filter = filter.gsub(/%s/, node)
+                end
+
+                parent = nil
+                classes = []
+
+                found = false
+                # We're always doing a sub here; oh well.
+                @ldap.search(Puppet[:ldapbase], 2, filter, sattrs) do |entry|
+                    found = true
+                    if pattr
+                        if values = entry.vals(pattr)
+                            if values.length > 1
+                                raise Puppet::Error,
+                                    "Node %s has more than one parent: %s" %
+                                    [node, values.inspect]
+                            end
+                            unless values.empty?
+                                parent = values.shift
+                            end
+                        end
+                    end
+
+                    attrs.each { |attr|
+                        if values = entry.vals(attr)
+                            classes += values
+                        end
+                    }
+                end
+
+                classes.flatten!
+
+                return parent, classes
+            end
+
             def parsedate
                 parsefiles()
                 @parsedate
@@ -67,8 +178,24 @@ module Puppet
                                 "Cannot evaluate nodes with a nil client"
                         end
 
+                        classes = nil
+                        parent = nil
+                        # At this point, stop at the first source that defines
+                        # the node
+                        @nodesources.each do |source|
+                            method = "nodesearch_%s" % source
+                            if self.respond_to? method
+                                parent, classes = self.send(method, client)
+                            end
+
+                            if classes
+                                Puppet.info "Found %s in %s" % [client, source]
+                                break
+                            end
+                        end
+
                         # We've already evaluated the AST, in this case
-                        return @scope.evalnode(names, facts)
+                        return @scope.evalnode(names, facts, classes, parent)
                     else
                         # We've already evaluated the AST, in this case
                         @scope = Puppet::Parser::Scope.new() # no parent scope
@@ -164,4 +291,4 @@ module Puppet
     end
 end
 
-# $Id: interpreter.rb 858 2006-01-30 19:22:25Z luke $
+# $Id: interpreter.rb 915 2006-02-15 21:56:54Z luke $