puppet 0.16.0 → 0.18.4

data/bin/puppetrun

@@ -0,0 +1,385 @@
+#!/usr/bin/env ruby
+
+#
+# = Synopsis
+#
+# Trigger a puppetd run on a set of hosts.
+#
+# = Usage
+#
+#   puppetrun [-a|--all] [-c|--class <class>] [-d|--debug] [-f|--foreground]
+#       [-h|--help] [--host <host>] [--no-fqdn] [--ignoreschedules]
+#       [-t|--tag <tag>] [--test]
+#
+# = Description
+#
+# This script can be used to connect to a set of machines running +puppetd+
+# and trigger them to run their configurations.  The most common usage would
+# be to specify a class of hosts and a set of tags, and +puppetrun+ would
+# look up in LDAP all of the hosts matching that class, then connect to
+# each host and trigger a run of all of the objects with the specified tags.
+#
+# If you are not storing your host configurations in LDAP, you can specify
+# hosts manually.
+#
+# You will most likely have to run +puppetrun+ as root to get access to
+# the SSL certificates.
+#
+# +puppetrun+ reads +puppetmaster+'s configuration file, so that it can copy
+# things like LDAP settings.
+#
+# = Usage Notes
+#
+# +puppetrun+ is useless unless +puppetd+ is listening.  See its documentation
+# for more information, but the gist is that you must enable +listen+ on the
+# +puppetd+ daemon, either using +--listen+ on the command line or adding
+# 'listen: true' in its config file.  In addition, you need to set the daemons
+# up to specifically allow connections by creating the +namespaceauth+ file,
+# normally at '/etc/puppet/namespaceauth.conf'.  This file specifies who has
+# access to each namespace; if you create the file you must add every namespace
+# you want any Puppet daemon to allow -- it is currently global to all Puppet
+# daemons.
+#
+# An example file looks like this:
+#
+#     [fileserver]
+#         allow *.madstop.com
+# 
+#     [puppetmaster]
+#         allow *.madstop.com
+# 
+#     [puppetrunner]
+#         allow culain.madstop.com
+#
+# This is what you would install on your Puppet master; non-master hosts could
+# leave off the 'fileserver' and 'puppetmaster' namespaces.
+#
+# Expect more documentation on this eventually.
+#
+# = Options
+#
+# Note that any configuration parameter that's valid in the configuration file
+# is also a valid long argument.  For example, 'ssldir' is a valid configuration
+# parameter, so you can specify '--ssldir <directory>' as an argument.
+#
+# See the configuration file for the full list of acceptable parameters.
+#
+# all::
+#   Connect to all available hosts.  Requires LDAP support at this point.
+#
+# class::
+#   Specify a class of machines to which to connect.  This only works if you
+#   have LDAP configured, at the moment.
+#
+# debug::
+#   Enable full debugging.
+#
+# foreground::
+#   Run each configuration in the foreground; that is, when connecting to a host,
+#   do not return until the host has finished its run.  The default is false.
+#
+# help::
+#   Print this help message
+#
+# host::
+#   A specific host to which to connect.  This flag can be specified more
+#   than once.
+#
+# ignoreschedules::
+#   Whether the client should ignore schedules when running its configuration.
+#   This can be used to force the client to perform work it would not normally
+#   perform so soon.  The default is false.
+#
+# parallel::
+#   How parallel to make the connections.  Parallelization is provided by forking
+#   for each client to which to connect.  The default is 1, meaning serial execution.
+#
+# tag::
+#   Specify a tag for selecting the objects to apply.
+#
+# test::
+#   Print the hosts you would connect to but do not actually connect.
+#
+# = Example
+#
+#   sudo puppetrun -p 10 --host host1 --host host2 -t remotefile -t webserver
+#
+# = Author
+#
+# Luke Kanies
+#
+# = Copyright
+#
+# Copyright (c) 2005 Reductive Labs, LLC
+# Licensed under the GNU Public License
+
+[:INT, :TERM].each do |signal|
+    trap(signal) do
+        $stderr.puts "Cancelling"
+        exit(1)
+    end
+end
+require 'ldap'
+require 'puppet'
+require 'puppet/server'
+require 'puppet/client'
+require 'getoptlong'
+
+
+# Look up all nodes matching a given class in LDAP.
+def ldapnodes(klass, fqdn = true)
+    unless defined? @ldap
+        setupldap()
+    end
+
+    hosts = []
+
+    filter = nil
+    if klass == :all
+        filter = "objectclass=puppetclient"
+    else
+        filter = "puppetclass=#{klass}"
+    end
+    @ldap.search(Puppet[:ldapbase], 2, filter, "cn") do |entry|
+        # Skip the default host entry
+        if entry.dn =~ /cn=default,/
+            $stderr.puts "Skipping default host entry"
+            next
+        end
+
+        if fqdn
+            hosts << entry.dn.sub("cn=",'').sub(/ou=hosts,/i, '').gsub(",dc=",".")
+        else
+            hosts << entry.get_values("cn")[0]
+        end
+    end
+
+    return hosts
+end
+
+def setupldap
+    begin
+        @ldap = Puppet::Parser::Interpreter.ldap()
+    rescue => detail
+        $stderr.puts "Could not connect to LDAP: %s" % detail
+        exit(34)
+    end
+end
+
+$haveusage = true
+
+begin
+    require 'rdoc/usage'
+rescue LoadError
+    $haveusage = false
+end
+
+flags = [
+    [ "--all",      "-a",	        GetoptLong::NO_ARGUMENT ],
+    [ "--class",	"-c",			GetoptLong::REQUIRED_ARGUMENT ],
+    [ "--foreground", "-f",	        GetoptLong::NO_ARGUMENT ],
+    [ "--debug",	"-d",			GetoptLong::NO_ARGUMENT ],
+    [ "--help",		"-h",			GetoptLong::NO_ARGUMENT ],
+    [ "--host",         			GetoptLong::REQUIRED_ARGUMENT ],
+    [ "--parallel", "-p",			GetoptLong::REQUIRED_ARGUMENT ],
+    [ "--no-fqdn",  "-n",			GetoptLong::NO_ARGUMENT ],
+    [ "--test",                     GetoptLong::NO_ARGUMENT ],
+    [ "--version",  "-V",           GetoptLong::NO_ARGUMENT ]
+]
+
+# Add all of the config parameters as valid options.
+Puppet.config.addargs(flags)
+
+result = GetoptLong.new(*flags)
+
+options = {
+    :ignoreschedules => false,
+    :foreground => false,
+    :parallel => 1,
+    :debug => false,
+    :test => false,
+    :all => false,
+    :verbose => true,
+    :fqdn => true
+}
+
+hosts = []
+classes = []
+tags = []
+
+Puppet::Log.newdestination(:console)
+
+begin
+    result.each { |opt,arg|
+        case opt
+            when "--version"
+                puts "%s" % Puppet.version
+                exit
+            when "--ignoreschedules"
+                options[:ignoreschedules] = true
+            when "--no-fqdn"
+                options[:fqdn] = false
+            when "--all"
+                options[:all] = true
+            when "--test"
+                options[:test] = true
+            when "--tag"
+                tags << arg
+            when "--class"
+                classes << arg
+            when "--host"
+                hosts << arg
+            when "--help"
+                if $haveusage
+                    RDoc::usage && exit
+                else
+                    puts "No help available unless you have RDoc::usage installed"
+                    exit
+                end
+            when "--parallel"
+                begin
+                    options[:parallel] = Integer(arg)
+                rescue
+                    $stderr.puts "Could not convert %s to an integer" % arg.inspect
+                    exit(23)
+                end
+            when "--foreground"
+                options[:foreground] = true
+            when "--debug"
+                options[:debug] = true
+            else
+                Puppet.config.handlearg(opt, arg)
+        end
+    }
+rescue GetoptLong::InvalidOption => detail
+    $stderr.puts "Try '#{$0} --help'"
+    #if $haveusage
+    #    RDoc::usage(1,'usage')
+    #end
+    exit(1)
+end
+
+if options[:debug]
+    Puppet::Log.level = :debug
+else
+    Puppet::Log.level = :info
+end
+
+# Now parse the config
+config = File.join(Puppet[:confdir], "puppetmasterd.conf")
+if File.exists? config
+    Puppet.config.parse(config)
+end
+
+if Puppet[:ldapnodes]
+    if options[:all]
+        hosts = ldapnodes(:all, options[:fqdn])
+        puts "all: %s" % hosts.join(", ")
+    else
+        classes.each do |klass|
+            list = ldapnodes(klass, options[:fqdn])
+            puts "%s: %s" % [klass, list.join(", ")]
+
+            hosts += list
+        end
+    end
+elsif ! classes.empty?
+    $stderr.puts "You must be using LDAP to specify host classes"
+    exit(24)
+end
+
+if tags.empty?
+    tags = ""
+else
+    tags = tags.join(",")
+end
+
+children = {}
+
+# If we get a signal, then kill all of our children and get out.
+[:INT, :TERM].each do |signal|
+    trap(signal) do
+        Puppet.notice "Caught #{signal}; shutting down"
+        children.each do |pid, host|
+            Process.kill("INT", pid)
+        end
+
+        waitall
+
+        exit(1)
+    end
+end
+
+if options[:test]
+    puts "Skipping execution in test mode"
+    exit(0)
+end
+
+todo = hosts.dup
+
+failures = []
+
+# Now do the actual work
+go = true
+while go
+    # If we don't have enough children in process and we still have hosts left to
+    # do, then do the next host.
+    if children.length < options[:parallel] and ! todo.empty?
+        host = todo.shift
+        pid = fork do
+            # First make sure the client is up
+            out = %x{ping -c 1 #{host}}
+
+            unless $? == 0
+                $stderr.print "Could not contact %s\n" % host
+                next
+            end
+            client = Puppet::Client::Runner.new(
+                :Server => host,
+                :Port => Puppet[:puppetport]
+            )
+
+            print "Triggering %s\n" % host
+            begin
+                client.run(tags, options[:ignoreschedules], options[:foreground])
+            rescue => detail
+                $stderr.print "Host %s failed: %s\n" % [host, detail]
+                exit(2)
+            end
+        end
+        children[pid] = host
+    else
+        # Else, see if we can reap a process.
+        begin
+            pid = Process.wait
+
+            if host = children[pid]
+                # Remove our host from the list of children, so the parallelization
+                # continues working.
+                children.delete(pid)
+                if $?.exitstatus != 0
+                    failures << host
+                end
+                print "%s finished with exit code %s\n" % [host, $?.exitstatus]
+            else
+                $stderr.puts "Could not find host for PID %s with status %s" %
+                    [pid, $?.exitstatus]
+            end
+        rescue Errno::ECHILD
+            # There are no children left, so just exit unless there are still
+            # children left to do.
+            next unless todo.empty?
+
+            if failures.empty?
+                puts "Finished"
+                exit(0)
+            else
+                puts "Failed: %s" % failures.join(", ")
+                exit(3)
+            end
+        end
+    end
+end
+
+
+# $Id: puppetrun 1338 2006-06-29 19:29:05Z luke $

data/conf/redhat/client.init

@@ -50,8 +50,11 @@ stop() {
 }
 
 restart() {
-	stop
-	start
+	echo -n $"Restarting puppet: "
+        killproc $puppetd -HUP
+	RETVAL=$?
+	echo
+	return $RETVAL
 }
 
 case "$1" in

data/conf/redhat/fileserver.conf

@@ -6,7 +6,7 @@
 # for allow/deny does not matter, allow always takes precedence
 # over deny
 [files]
-  path /var/puppet/files
+  path /var/lib/puppet/files
 #  allow *.example.com
 #  deny *.evil.example.com
 #  allow 192.168.0.0/24

data/conf/redhat/lsb-config.patch

@@ -0,0 +1,51 @@
+--- puppet-0.18.0/conf/redhat/fileserver.conf.orig	2006-06-20 12:13:49.000000000 -0700
++++ puppet-0.18.0/conf/redhat/fileserver.conf	2006-06-20 12:14:03.000000000 -0700
+@@ -6,7 +6,7 @@
+ # for allow/deny does not matter, allow always takes precedence
+ # over deny
+ [files]
+-  path /var/puppet/files
++  path /var/lib/puppet/files
+ #  allow *.example.com
+ #  deny *.evil.example.com
+ #  allow 192.168.0.0/24
+--- puppet-0.18.0/conf/redhat/puppetd.conf.orig	2006-06-20 12:12:01.000000000 -0700
++++ puppet-0.18.0/conf/redhat/puppetd.conf	2006-06-20 12:14:37.000000000 -0700
+@@ -1,5 +1,33 @@
++[puppet]
++    # Where Puppet stores dynamic and growing data.
++    # The default value is '/var/puppet'.
++    vardir = /var/lib/puppet
++
++    # The Puppet log directory.
++    # The default value is '$vardir/log'.
++    logdir = /var/log/puppet
++
++    # Where Puppet PID files are kept.
++    # The default value is '$vardir/run'.
++    rundir = /var/run/puppet
++
++    # Where lock files are kept.
++    # The default value is '$vardir/locks'.
++    lockdir = /var/lock
++
++    # Where SSL certificates are kept.
++    # The default value is '$confdir/ssl'.
++    ssldir = $vardir/ssl
++
+ [puppetd]
+-# Make sure all log messages are sent to the right directory
+-# This directory must be writable by the puppet user
+-logdir=/var/log/puppet
+-rundir=/var/run
++    # The file in which puppetd stores a list of the classes
++    # associated with the retrieved configuratiion.  Can be loaded in
++    # the separate ``puppet`` executable using the ``--loadclasses``
++    # option.
++    # The default value is '$confdir/classes.txt'.
++    classfile = $vardir/classes.txt
++
++    # Where puppetd caches the local configuration.  An
++    # extension indicating the cache format is added automatically.
++    # The default value is '$confdir/localconfig'.
++    localconfig = $vardir/localconfig