puppet 0.22.4 → 0.23.0

data/bin/puppetmasterd

@@ -180,9 +180,7 @@ unless options[:setdest]
 end
 
 # Now parse the config
-if Puppet[:config] and File.exists? Puppet[:config]
-    Puppet.config.parse(Puppet[:config])
-end
+Puppet.parse_config
 
 Puppet.genconfig
 Puppet.genmanifest
@@ -252,7 +250,7 @@ begin
         server = Puppet::Network::Server::WEBrick.new(:Handlers => handlers)
     when "mongrel":
         require 'puppet/network/server/mongrel'
-        handler = Puppet::Network::Server::MongrelHandler.new(handlers)
+        handler = Puppet::Network::Server::Mongrel.new(handlers)
         addr = Puppet[:bindaddress]
         if addr == ""
             addr =  "127.0.0.1"
@@ -301,4 +299,4 @@ when "mongrel":
     server.run.join
 end
 
-# $Id: puppetmasterd 2417 2007-04-26 18:58:07Z luke $
+# $Id: puppetmasterd 2594 2007-06-15 23:11:43Z luke $

data/bin/puppetrun

@@ -100,10 +100,13 @@
 #   for each client to which to connect.  The default is 1, meaning serial execution.
 #
 # tag::
-#   Specify a tag for selecting the objects to apply.
+#   Specify a tag for selecting the objects to apply. Does not work with the
+#   --test option.
+#
 #
 # test::
-#   Print the hosts you would connect to but do not actually connect.
+#   Print the hosts you would connect to but do not actually connect. This
+#   option requires LDAP support at this point.
 #
 # = Example
 #
@@ -272,6 +275,8 @@ end
 
 # Now parse the config
 config = File.join(Puppet[:confdir], "puppetmasterd.conf")
+Puppet.parse_config(config)
+
 if File.exists? config
     Puppet.config.parse(config)
 end
@@ -397,4 +402,4 @@ while go
 end
 
 
-# $Id: puppetrun 2352 2007-03-24 22:07:19Z luke $
+# $Id: puppetrun 2464 2007-05-06 05:42:53Z luke $

data/bin/ralsh

@@ -0,0 +1,271 @@
+#!/usr/bin/ruby
+# vim: softtabstop=4 shiftwidth=4 expandtab
+#
+# = Synopsis
+#
+# Use the Puppet RAL to directly interact with the system.
+#
+# = Usage
+#
+#   ralsh [-h|--help] [-d|--debug] [-v|--verbose] [-e|--edit] [-H|--host <host>]
+#           [-p|--param <param>] [-t|--types] type <name>
+#
+# = Description
+#
+# This command provides simple facilities for converting current system state
+# into Puppet code, along with some ability to use Puppet to affect the current
+# state.
+#
+# By default, you must at least provide a type to list, which case ralsh
+# will tell you everything it knows about all instances of that type.  You can
+# optionally specify an instance name, and ralsh will only describe that single
+# instance.
+#
+# You can also add +--edit+ as an argument, and ralsh will write its output
+# to a file, open that file in an editor, and then apply the file as a Puppet
+# transaction.  You can easily use this to use Puppet to make simple changes to
+# a system.
+#
+# = 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 documentation at
+# http://reductivelabs.com/projects/puppet/reference/configref.html for
+# the full list of acceptable parameters. A commented list of all
+# configuration options can also be generated by running puppet with
+# '--genconfig'.
+#
+# debug::
+#   Enable full debugging.
+#
+# edit:
+#   Write the results of the query to a file, open the file in an editor,
+#   and read the file back in as an executable Puppet manifest.
+#
+# host:
+#   When specified, connect to the resource server on the named host
+#   and retrieve the list of resouces of the type specified.
+#
+# help:
+#   Print this help message.
+#
+# param:
+#   Add more parameters to be outputted from queries.
+#
+# types:
+#   List all available types.
+#
+# verbose::
+#   Print extra information.
+#
+# = Example
+#
+#   $ ralsh user luke
+#   user { 'luke':
+#       home => '/home/luke',
+#       uid => '100',
+#       ensure => 'present',
+#       comment => 'Luke Kanies,,,',
+#       gid => '1000',
+#       shell => '/bin/bash',
+#       groups => ['sysadmin','audio','video','puppet']
+#   }
+#   $
+#
+# = Author
+#
+# Luke Kanies
+#
+# = Copyright
+#
+# Copyright (c) 2005-2007 Reductive Labs, LLC
+# Licensed under the GNU Public License
+
+
+require 'getoptlong'
+require 'puppet'
+
+options = [
+    [ "--debug",	"-d",			GetoptLong::NO_ARGUMENT ],
+    [ "--verbose",  "-v",			GetoptLong::NO_ARGUMENT ],
+    [ "--types",    "-t",                   GetoptLong::NO_ARGUMENT ],
+    [ "--param",    "-p",                   GetoptLong::REQUIRED_ARGUMENT ],
+    [ "--host",     "-H",                   GetoptLong::REQUIRED_ARGUMENT ],
+    [ "--edit",             "-e",                   GetoptLong::NO_ARGUMENT ],
+    [ "--help",             "-h",                   GetoptLong::NO_ARGUMENT ]
+]
+
+# Add all of the config parameters as valid options.
+Puppet.config.addargs(options)
+
+result = GetoptLong.new(*options)
+
+debug = false
+verbose = false
+edit = false
+extra_params = []
+host = nil
+
+result.each { |opt,arg|
+    case opt
+    when "--host"
+        host = arg
+    when "--types"
+        types = []
+        Puppet::Type.loadall
+        Puppet::Type.eachtype do |t|
+            next if t.name == :component
+            types << t.name.to_s
+        end
+        puts types.sort
+        exit
+    when "--param"
+        extra_params << arg.to_sym
+    when "--edit"
+        edit = true
+    when "--help"
+        if Puppet.features.usage?
+            RDoc::usage
+        else
+            puts "install RDoc:usage for help"
+        end
+        exit
+    when "--verbose"
+        verbose = true
+    when "--debug"
+        debug = true
+    else
+        # Anything else is handled by the config stuff
+        Puppet.config.handlearg(opt, arg)
+    end
+}
+
+Puppet::Util::Log.newdestination(:console)
+
+# Now parse the config
+Puppet.parse_config
+
+if debug
+    Puppet::Util::Log.level = :debug
+elsif verbose
+    Puppet::Util::Log.level = :info
+end
+
+
+if ARGV.length > 0
+    type = ARGV.shift
+else
+    raise "You must specify the type to display"
+end
+
+name = nil
+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
+    end
+end
+
+if edit and host
+    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|
+    trans.dup.collect do |param, value|
+        if value == "" or value == []
+            trans.delete(param)
+        end
+
+        unless properties.include?(param) or extra_params.include?(param)
+            trans.delete(param)
+        end
+    end
+    trans.to_manifest
+}
+
+text = if host
+    client = Puppet::Network::Client.resource.new(:Server => host, :Port => Puppet[:puppetport])
+    unless client.read_cert
+        raise "client.read_cert failed"
+    end
+    begin
+        # They asked for a single resource.
+        if name
+            transbucket = [client.describe(type, name)]
+        else
+            # Else, list the whole thing out.
+            transbucket = client.instances(type)
+        end
+    rescue Puppet::Network::XMLRPCClientError => exc
+        raise "client.list(#{type}) failed: #{exc.message}"
+    end
+    transbucket.sort { |a,b| a.name <=> b.name }.collect(&format)
+else
+    if name
+        obj = typeobj.create(:name => name, :check => properties)
+        vals = obj.retrieve
+
+        unless params.empty?
+            params.each do |param, value|
+                obj[param] = value
+            end
+            comp = Puppet::Type.type(:component).create(:name => "ralsh")
+            comp.push(obj)
+            transaction = comp.evaluate
+            begin
+                transaction.evaluate
+            rescue => detail
+                if Puppet[:trace]
+                    puts detail.backtrace
+                end
+            end
+
+        end
+        [format.call(obj.to_trans(true))]
+    else
+        typeobj.instances.collect do |obj|
+            next if ARGV.length > 0 and ! ARGV.include? obj.name
+            trans = obj.to_trans(true)
+            format.call(trans)
+        end
+    end
+end.compact.join("\n")
+
+if edit
+    file = "/tmp/x2puppet-#{Process.pid}.pp"
+    begin
+        File.open(file, "w") do |f|
+            f.puts text
+        end
+        ENV["EDITOR"] ||= "vi"
+        system(ENV["EDITOR"], file)
+        system("puppet -v " + file)
+    ensure
+        #if FileTest.exists? file
+        #    File.unlink(file)
+        #end
+    end
+else
+    puts text
+end
+
+# $Id: ralsh 2573 2007-06-13 22:31:52Z luke $

data/conf/redhat/client.init

@@ -15,7 +15,7 @@ export PATH
 
 [ -f /etc/sysconfig/puppet ] && . /etc/sysconfig/puppet
 lockfile=${LOCKFILE-/var/lock/subsys/puppet}
-pidfile=${PIDFILE-/var/run/puppet.pid}
+pidfile=${PIDFILE-/var/run/puppet/puppet.pid}
 puppetd=${PUPPETD-/usr/sbin/puppetd}
 RETVAL=0
 

data/conf/redhat/puppet.spec

@@ -7,12 +7,12 @@
 
 Summary: A network tool for managing many disparate systems
 Name: puppet
-Version: 0.22.4
+Version: 0.23.0
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
 
-URL: http://reductivelabs.com/projects/puppet/
+URL: http://puppet.reductivelabs.com/
 Source: http://reductivelabs.com/downloads/puppet/%{name}-%{version}.tgz
 
 Requires: ruby >= 1.8.1
@@ -61,6 +61,8 @@ done
 %{__install} -d -m0755 %{buildroot}%{_localstatedir}/log/puppet
 %{__install} -Dp -m0755 %{pbuild}/bin/* %{buildroot}%{_sbindir}
 %{__mv} %{buildroot}%{_sbindir}/puppet %{buildroot}%{_bindir}/puppet
+%{__mv} %{buildroot}%{_sbindir}/ralsh %{buildroot}%{_bindir}/ralsh
+%{__mv} %{buildroot}%{_sbindir}/filebucket %{buildroot}%{_bindir}/filebucket
 %{__mv} %{buildroot}%{_sbindir}/puppetrun %{buildroot}%{_bindir}/puppetrun
 %{__install} -Dp -m0644 %{pbuild}/lib/puppet.rb %{buildroot}%{ruby_sitelibdir}/puppet.rb
 %{__cp} -a %{pbuild}/lib/puppet %{buildroot}%{ruby_sitelibdir}
@@ -78,9 +80,12 @@ find %{buildroot}%{ruby_sitelibdir} -type f -perm +ugo+x -print0 | xargs -0 -r %
 %files
 %defattr(-, root, root, 0755)
 %{_bindir}/puppet
+%{_bindir}/ralsh
+%{_bindir}/filebucket
 %{_sbindir}/puppetd
 %{ruby_sitelibdir}/*
 %{_initrddir}/puppet
+%dir %{_sysconfdir}/puppet
 %config(noreplace) %{_sysconfdir}/sysconfig/puppet
 %config(noreplace) %{_sysconfdir}/puppet/puppetd.conf
 %doc CHANGELOG COPYING LICENSE README TODO examples
@@ -136,6 +141,12 @@ fi
 %{__rm} -rf %{buildroot}
 
 %changelog
+* Wed May  2 2007 David Lutterkort <dlutter@redhat.com> - 0.22.4-1
+- New version
+
+* Thu Mar 29 2007 David Lutterkort <dlutter@redhat.com> - 0.22.3-1
+- Claim ownership of _sysconfdir/puppet (bz 233908)
+
 * Mon Mar 19 2007 David Lutterkort <dlutter@redhat.com> - 0.22.2-1
 - Set puppet's homedir to /var/lib/puppet, not /var/puppet
 - Remove no-lockdir patch, not needed anymore

data/conf/solaris/pkginfo

@@ -1,6 +1,6 @@
 PKG=CSWpuppet
 NAME=puppet - System Automation Framework
-VERSION=0.22.4
+VERSION=0.23.0
 CATEGORY=application
 VENDOR=http://reductivelabs.com/projects/puppet
 HOTLINE=http://reductivelabs.com/cgi-bin/puppet.cgi

data/ext/puppet-test

@@ -0,0 +1,374 @@
+#!/usr/bin/env ruby
+# == Synopsis 
+#
+# Test individual client performance.  Can compile configurations, describe
+# files, or retrieve files.
+#
+# = Usage
+#
+#   puppet-test  [-c|--compile] [-D|--describe <file>] [-d|--debug]
+#       [--fork <num>] [-h|--help] [-H|--hostname <host name>] [-l|--list] [-r|--repeat <number=1>]
+#       [-R|--retrieve <file>] [-t|--test <test>] [-V|--version] [-v|--verbose]
+#
+# = Description
+#
+# This is a simple script meant for doing performance tests with Puppet.  By
+# default it pulls down a compiled configuration, but it supports multiple
+# other tests.
+#
+# = Options
+#
+# Note that any configuration parameter that's valid in the configuration file
+# is also a valid long argument.  For example, 'server' is a valid configuration
+# parameter, so you can specify '--server <servername>' as an argument.
+#
+# See the configuration file documentation at
+# http://reductivelabs.com/projects/puppet/reference/configref.html for
+# the full list of acceptable parameters. A commented list of all
+# configuration $options can also be generated by running puppetd with
+# '--genconfig'.
+#
+# compile::
+#   Compile the client's configuration.  The default.
+#
+# debug::
+#   Enable full debugging.
+#
+# describe::
+#   Describe the file being tested.  This is a query to get information about
+#   the file from the server, to determine if it should be copied, and is the
+#   first half of every file transfer.
+#
+# fork::
+#   Fork the specified number of times, thus acting as multiple clients.
+#
+# 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.
+#   If you need to use this flag, it is generally an indication of a setup problem.
+#
+# help::
+#   Print this help message
+#
+# list::
+#   List all available tests.
+#
+# repeat::
+#  How many times to perform the test.
+#
+# retrieve::
+#   Test file retrieval performance.  Retrieves the specified file from the
+#   remote system.  Note that the server should be specified via --server,
+#   so the argument to this option is just the remote module name and path,
+#   e.g., "/dist/apps/myapp/myfile", where "dist" is the module and
+#   "apps/myapp/myfile" is the path to the file relative to the module.
+#
+# test::
+#   Specify the test to run.  You can see the list of tests by running this command with --list.
+#
+# verbose::
+#   Turn on verbose reporting.
+#
+# version::
+#   Print the puppet version number and exit.
+#
+# = Example
+#
+#   puppet-test --retrieve /module/path/to/file
+#
+# = Author
+#
+# Luke Kanies
+#
+# = Copyright
+#
+# Copyright (c) 2005, 2006 Reductive Labs, LLC
+# Licensed under the GNU Public License
+
+# Do an initial trap, so that cancels don't get a stack trace.
+trap(:INT) do
+    $stderr.puts "Cancelling startup"
+    exit(0)
+end
+
+require 'puppet'
+require 'puppet/network/client'
+require 'getoptlong'
+
+class Suite
+    attr_reader :name, :doc
+
+    @@suites = {}
+    @@tests = {}
+
+    def self.[](name)
+        @@suites[name]
+    end
+
+    # Run a test by first finding the suite then running the appropriate test.
+    def self.run(test)
+        unless suite_name = @@tests[test]
+            raise "Unknown test %s" % test
+
+        end
+        unless suite = @@suites[suite_name]
+            raise "Unknown test suite %s from test %s" % [suite_name, test]
+        end
+
+        suite.run(test)
+    end
+
+    # What suites are available?
+    def self.suites
+        @@suites.keys
+    end
+
+    def forked?
+        defined? @forking
+    end
+
+    # Create a new test suite.
+    def initialize(name, doc, &block)
+        @name = name
+        @doc = doc
+
+        @tests = {}
+
+        @@suites[name] = self
+
+        raise "You must pass a block to the Test" unless block_given?
+        instance_eval(&block)
+    end
+
+    def prepare
+        raise "Test %s did not override 'prepare'" % @name
+    end
+
+    # Define a new type of test on this suite.
+    def newtest(name, doc, &block)
+        @tests[name] = doc
+
+        if @@tests[name]
+            raise "Test names must be unique; cannot redefine %s" % name
+        end
+
+        @@tests[name] = @name
+
+        meta_def(name, &block)
+    end
+
+    # Run the actual test.
+    def run(test)
+        unless doc = @tests[test]
+            raise "Suite %s only supports tests %s; not %s" % [@name, @tests.keys.collect { |k| k.to_s }.join(","), test]
+        end
+        puts "Running %s %s test" % [@name, test]
+        prepare()
+
+        if $options[:fork] > 0
+            @forking = true
+            $options[:fork].times {
+                if pid = fork
+                    $pids << pid
+                else
+                    break
+                end
+            }
+        end
+
+        $options[:repeat].times do
+            if forked?
+                msg = doc + " in PID %s" % Process.pid
+            else
+                msg = doc
+            end
+            Puppet::Util.benchmark(:notice, msg) do
+                begin
+                    send(test)
+                rescue => detail
+                    puts detail.backtrace if Puppet[:trace]
+                    Puppet.err "%s failed: %s" % [@name, detail.to_s]
+                end
+            end
+        end
+    end
+
+    # What tests are available on this suite?
+    def tests
+        @tests.keys
+    end
+end
+
+Suite.new :configuration, "Configuration handling" do
+    def prepare
+        $args[:cache] = false
+        # Create a config client and pull the config down
+        @client = Puppet::Network::Client.master.new($args)
+        unless @client.read_cert
+            fail "Could not read client certificate"
+        end
+
+        # Use the facts from the cache, to skip the time it takes
+        # to load them.
+        @client.dostorage
+        @facts = Puppet::Util::Storage.cache(:configuration)[:facts]
+
+        if @facts.empty?
+            @facts = @client.master.getfacts
+        end
+
+        if host = $options[:fqdn]
+            @facts["fqdn"] = host
+            @facts["hostname"] = host.sub(/\..+/, '')
+            @facts["domain"] = host.sub(/^[^.]+\./, '')
+        end
+
+        @facts = YAML.dump(@facts)
+    end
+
+    newtest :compile, "Compiled configuration" do
+        @client.driver.getconfig(@facts, "yaml")
+    end
+
+    # This test will always force a false answer.
+    newtest :fresh, "Checked freshness" do
+        @client.driver.freshness
+    end
+end
+
+Suite.new :file, "File interactions" do
+    def prepare
+        unless $options[:file]
+            fail "You must specify a file (using --file <file>) to interact with on the server"
+        end
+        @client = Puppet::Network::Client.file.new($args)
+        unless @client.read_cert
+            fail "Could not read client certificate"
+        end
+    end
+
+    newtest :describe, "Described file" do
+        @client.describe($options[:file], :ignore)
+    end
+
+    newtest :retrieve, "Retrieved file" do
+        @client.retrieve($options[:file], :ignore)
+    end
+end
+
+$cmdargs = [
+	[ "--compile",    "-c",			GetoptLong::NO_ARGUMENT ],
+	[ "--describe",  "-D",			GetoptLong::REQUIRED_ARGUMENT ],
+	[ "--retrieve",  "-R",			GetoptLong::REQUIRED_ARGUMENT ],
+	[ "--fork",          			GetoptLong::REQUIRED_ARGUMENT ],
+	[ "--fqdn",      "-F",			GetoptLong::REQUIRED_ARGUMENT ],
+	[ "--suite",     "-s",			GetoptLong::REQUIRED_ARGUMENT ],
+	[ "--test",      "-t",			GetoptLong::REQUIRED_ARGUMENT ],
+	[ "--repeat",    "-r",			GetoptLong::REQUIRED_ARGUMENT ],
+	[ "--debug",	 "-d",			GetoptLong::NO_ARGUMENT ],
+	[ "--help",		 "-h",			GetoptLong::NO_ARGUMENT ],
+	[ "--list",	     "-l",			GetoptLong::NO_ARGUMENT ],
+	[ "--verbose",	 "-v",			GetoptLong::NO_ARGUMENT ],
+	[ "--version",	 "-V",			GetoptLong::NO_ARGUMENT ],
+]
+
+# Add all of the config parameters as valid $options.
+Puppet.config.addargs($cmdargs)
+Puppet::Util::Log.newdestination(:console)
+
+result = GetoptLong.new(*$cmdargs)
+
+$args = {}
+
+$options = {:repeat => 1, :fork => 0}
+
+begin
+    explicit_waitforcert = false
+    result.each { |opt,arg|
+        case opt
+            # First check to see if the argument is a valid configuration parameter;
+            # if so, set it.
+            when "--compile"
+                $options[:suite] = :configuration
+                $options[:test] = :compile
+            when "--retrieve"
+                $options[:suite] = :file
+                $options[:test] = :retrieve
+                $options[:file] = arg
+            when "--fork"
+                begin
+                    $options[:fork] = Integer(arg)
+                rescue => detail
+                    $stderr.puts "The argument to 'fork' must be an integer"
+                    exit(14)
+                end
+            when "--describe"
+                $options[:suite] = :file
+                $options[:test] = :describe
+                $options[:file] = arg
+            when "--fqdn"
+                $options[:fqdn] = arg
+            when "--repeat"
+                $options[:repeat] = Integer(arg)
+            when "--help"
+                if Puppet.features.usage?
+                    RDoc::usage && exit
+                else
+                    puts "No help available unless you have RDoc::usage installed"
+                    exit
+                end
+            when "--version"
+                puts "%s" % Puppet.version
+                exit
+            when "--verbose"
+                Puppet::Util::Log.level = :info
+                Puppet::Util::Log.newdestination(:console)
+            when "--debug"
+                Puppet::Util::Log.level = :debug
+                Puppet::Util::Log.newdestination(:console)
+            when "--suite"
+                $options[:suite] = arg.intern
+            when "--test"
+                $options[:test] = arg.intern
+            when "--file"
+                $options[:file] = arg
+            when "--list"
+                Suite.suites.sort { |a,b| a.to_s <=> b.to_s }.each do |suite_name|
+                    suite = Suite[suite_name]
+                    tests = suite.tests.sort { |a,b| a.to_s <=> b.to_s }.join(", ")
+                    puts "%20s: %s" % [suite_name, tests]
+                end
+                exit(0)
+            else
+                Puppet.config.handlearg(opt, arg)
+        end
+    }
+rescue GetoptLong::InvalidOption => detail
+    $stderr.puts detail
+    $stderr.puts "Try '#{$0} --help'"
+    exit(1)
+end
+
+# Now parse the config
+Puppet.parse_config
+
+$args[:Server] = Puppet[:server]
+
+unless $options[:test]
+    $options[:suite] = :configuration
+    $options[:test] = :compile
+end
+
+unless $options[:test]
+    raise "A suite was specified without a test"
+end
+
+$pids = []
+
+Suite.run($options[:test])
+
+if $options[:fork] > 0
+    Process.waitall
+end
+
+# $Id: puppet-test 2628 2007-06-19 20:04:52Z luke $