puppet 0.24.9 → 0.25.0

data/sbin/puppetrun

@@ -0,0 +1,130 @@
+#!/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] [-p|--ping]
+#
+# = 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 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 puppetmasterdd with
+# '--genconfig'.
+#
+#
+# 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. Does not work with the
+#   --test option.
+#
+#
+# test::
+#   Print the hosts you would connect to but do not actually connect. This
+#   option requires LDAP support at this point.
+#
+# ping::
+#
+#   Do a ICMP echo against the target host. Skip hosts that don't respond to ping.
+#
+# = 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
+
+require 'puppet/application/puppetrun'
+Puppet::Application[:puppetrun].run
+

data/spec/Rakefile

@@ -67,8 +67,8 @@ filemap.each do |dir, files|
     # First create a separate task for each file in the namespace.
     namespace ns do
         files.each do |file|
-            Spec::Rake::SpecTask.new(file) do |t|
-                t.spec_files = File.basename(file, '.rb')
+            Spec::Rake::SpecTask.new(File.basename(file, '.rb').to_sym) do |t|
+                t.spec_files = [ file ]
                 t.libs = libs
                 t.spec_opts = ['--options', 'spec.opts']
             end

data/spec/integration/application/puppet.rb

@@ -0,0 +1,33 @@
+#!/usr/bin/env ruby
+
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+require 'puppet_spec/files'
+
+require 'puppet/application/puppet'
+
+describe "Puppet" do
+    include PuppetSpec::Files
+
+    describe "when applying provided catalogs" do
+        confine "JSON library is missing; cannot test applying catalogs" => Puppet.features.json?
+        it "should be able to apply catalogs provided in a file in json" do
+            file_to_create = tmpfile("json_catalog")
+            catalog = Puppet::Resource::Catalog.new
+            resource = Puppet::Resource.new(:file, file_to_create, :content => "my stuff")
+            catalog.add_resource resource
+
+            manifest = tmpfile("manifest")
+
+            File.open(manifest, "w") { |f| f.print catalog.to_json }
+
+            puppet = Puppet::Application[:puppet]
+            puppet.options[:catalog] = manifest
+
+            puppet.apply
+
+            File.should be_exist(file_to_create)
+            File.read(file_to_create).should == "my stuff"
+        end
+    end
+end

data/spec/integration/bin/puppetmasterd.rb

@@ -0,0 +1,110 @@
+#!/usr/bin/env ruby
+
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+describe "puppetmasterd" do
+    before do
+        # Get a safe temporary file
+        file = Tempfile.new("puppetmaster_integration_testing")
+        @dir = file.path
+        file.delete
+
+        Dir.mkdir(@dir)
+
+        Puppet.settings[:confdir] = @dir
+        Puppet.settings[:vardir] = @dir
+        Puppet[:certdnsnames] = "localhost"
+
+        @@port = 12345
+    end
+
+    after {
+        stop
+
+        Puppet::SSL::Host.ca_location = :none
+
+        system("rm -rf %s" % @dir)
+        Puppet.settings.clear
+    }
+
+    def arguments
+        rundir = File.join(Puppet[:vardir], "run")
+        @pidfile = File.join(rundir, "testing.pid")
+        args = ""
+        args += " --confdir %s" % Puppet[:confdir]
+        args += " --rundir %s" % rundir
+        args += " --pidfile %s" % @pidfile
+        args += " --vardir %s" % Puppet[:vardir]
+        args += " --certdnsnames %s" % Puppet[:certdnsnames]
+        args += " --masterport %s" % @@port
+        args += " --user %s" % Puppet::Util::SUIDManager.uid
+        args += " --group %s" % Puppet::Util::SUIDManager.gid
+        args += " --autosign true"
+    end
+
+    def start(addl_args = "")
+        Puppet.settings.mkdir(:manifestdir)
+        Puppet.settings.write(:manifest) do |f|
+            f.puts { "notify { testing: }" }
+        end
+
+        args = arguments + addl_args
+
+        bin = File.join(File.dirname(__FILE__), "..", "..", "..", "sbin", "puppetmasterd")
+        output = %x{#{bin} #{args}}.chomp
+    end
+
+    def stop
+        if @pidfile and FileTest.exist?(@pidfile)
+            pid = File.read(@pidfile).chomp.to_i
+            Process.kill(:TERM, pid)
+        end
+    end
+
+    it "should create a PID file" do
+        start
+
+        FileTest.exist?(@pidfile).should be_true
+    end
+
+    it "should be serving status information over REST"
+
+    it "should be serving status information over xmlrpc" do
+        start
+
+        sleep 0.5
+
+        client = Puppet::Network::Client.status.new(:Server => "localhost", :Port => @@port)
+
+        FileUtils.mkdir_p(File.dirname(Puppet[:autosign]))
+        File.open(Puppet[:autosign], "w") { |f|
+            f.puts Puppet[:certname]
+        }
+
+        client.cert
+        retval = client.status
+
+        retval.should == 1
+    end
+
+    it "should exit with return code 0 after parsing if --parseonly is set and there are no errors" do
+        start(" --parseonly > /dev/null")
+        sleep(1)
+
+        ps = Facter["ps"].value || "ps -ef"
+        pid = nil
+        %x{#{ps}}.chomp.split(/\n/).each { |line|
+            next if line =~ /^puppet/ # skip normal master procs
+            if line =~ /puppetmasterd.+--manifest/
+                ary = line.split(" ")
+                pid = ary[1].to_i
+            end
+        }
+
+        $?.should == 0
+
+        pid.should be_nil
+    end
+
+    it "should exit with return code 1 after parsing if --parseonly is set and there are errors"
+end

data/spec/integration/configurer.rb

@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+
+require File.dirname(__FILE__) + '/../spec_helper'
+
+require 'puppet/configurer'
+
+describe Puppet::Configurer do
+    describe "when downloading plugins" do
+        it "should use the :pluginsignore setting, split on whitespace, for ignoring remote files" do
+            resource = Puppet::Type.type(:notify).new :name => "yay"
+            Puppet::Type.type(:file).expects(:new).with { |args| args[:ignore] == Puppet[:pluginsignore].split(/\s+/) }.returns resource
+
+            configurer = Puppet::Configurer.new
+            configurer.stubs(:download_plugins?).returns true
+            configurer.download_plugins
+        end
+    end
+end

data/spec/integration/defaults.rb

@@ -9,19 +9,26 @@ describe "Puppet defaults" do
     after { Puppet.settings.clear }
 
     describe "when setting the :factpath" do
-
         it "should add the :factpath to Facter's search paths" do
             Facter.expects(:search).with("/my/fact/path")
 
             Puppet.settings[:factpath] = "/my/fact/path"
         end
     end
+
     describe "when setting the :certname" do
         it "should fail if the certname is not downcased" do
             lambda { Puppet.settings[:certname] = "Host.Domain.Com" }.should raise_error(ArgumentError)
         end
     end
 
+    describe "when configuring the :crl" do
+        it "should warn if :cacrl is set to false" do
+            Puppet.expects(:warning)
+            Puppet.settings[:cacrl] = 'false'
+        end
+    end
+
     it "should have a clientyamldir setting" do
         Puppet.settings[:clientyamldir].should_not be_nil
     end
@@ -32,18 +39,46 @@ describe "Puppet defaults" do
 
     # See #1232
     it "should not specify a user or group for the clientyamldir" do
-        Puppet.settings.element(:clientyamldir).owner.should be_nil
-        Puppet.settings.element(:clientyamldir).group.should be_nil
+        Puppet.settings.setting(:clientyamldir).owner.should be_nil
+        Puppet.settings.setting(:clientyamldir).group.should be_nil
+    end
+
+    it "should use the service user and group for the yamldir" do
+        Puppet.settings.stubs(:service_user_available?).returns true
+        Puppet.settings.setting(:yamldir).owner.should == Puppet.settings[:user]
+        Puppet.settings.setting(:yamldir).group.should == Puppet.settings[:group]
     end
 
     # See #1232
     it "should not specify a user or group for the rundir" do
-        Puppet.settings.element(:rundir).owner.should be_nil
-        Puppet.settings.element(:rundir).group.should be_nil
+        Puppet.settings.setting(:rundir).owner.should be_nil
+        Puppet.settings.setting(:rundir).group.should be_nil
     end
 
-    it "should default to yaml as the catalog format" do
-        Puppet.settings[:catalog_format].should == "yaml"
+    it "should specify that the host private key should be owned by the service user" do
+        Puppet.settings.stubs(:service_user_available?).returns true
+        Puppet.settings.setting(:hostprivkey).owner.should == Puppet.settings[:user]
+    end
+
+    it "should specify that the host certificate should be owned by the service user" do
+        Puppet.settings.stubs(:service_user_available?).returns true
+        Puppet.settings.setting(:hostcert).owner.should == Puppet.settings[:user]
+    end
+
+    it "should use a bind address of ''" do
+        Puppet.settings[:bindaddress].should == ""
+    end
+
+    [:factdest].each do |setting|
+        it "should force the :factdest to be a directory" do
+            Puppet.settings[setting].should =~ /\/$/
+        end
+    end
+
+    [:modulepath, :factpath].each do |setting|
+        it "should configure '#{setting}' not to be a file setting, so multi-directory settings are acceptable" do
+            Puppet.settings.setting(setting).should be_instance_of(Puppet::Util::Settings::Setting)
+        end
     end
 
     it "should add /usr/sbin and /sbin to the path if they're not there" do
@@ -53,4 +88,120 @@ describe "Puppet defaults" do
             ENV["PATH"].split(File::PATH_SEPARATOR).should be_include("/sbin")
         end
     end
+
+    it "should default to json for the preferred serialization format" do
+        Puppet.settings.value(:preferred_serialization_format).should == "json"
+    end
+
+    describe "when enabling storeconfigs" do
+        before do
+            Puppet::Resource::Catalog.stubs(:cache_class=)
+            Puppet::Node::Facts.stubs(:cache_class=)
+            Puppet::Node.stubs(:cache_class=)
+
+            Puppet.features.stubs(:rails?).returns true
+        end
+
+        it "should set the Catalog cache class to :active_record" do
+            Puppet::Resource::Catalog.expects(:cache_class=).with(:active_record)
+            Puppet.settings[:storeconfigs] = true
+        end
+
+        it "should not set the Catalog cache class to :active_record if asynchronous storeconfigs is enabled" do
+            Puppet::Resource::Catalog.expects(:cache_class=).with(:active_record).never
+            Puppet.settings.expects(:value).with(:async_storeconfigs).returns true
+            Puppet.settings[:storeconfigs] = true
+        end
+
+        it "should set the Facts cache class to :active_record" do
+            Puppet::Node::Facts.expects(:cache_class=).with(:active_record)
+            Puppet.settings[:storeconfigs] = true
+        end
+
+        it "should set the Node cache class to :active_record" do
+            Puppet::Node.expects(:cache_class=).with(:active_record)
+            Puppet.settings[:storeconfigs] = true
+        end
+
+        it "should fail if rails is not available" do
+            Puppet.features.stubs(:rails?).returns false
+            lambda { Puppet.settings[:storeconfigs] = true }.should raise_error
+        end
+    end
+
+    describe "when enabling asynchronous storeconfigs" do
+        before do
+            Puppet::Resource::Catalog.stubs(:cache_class=)
+            Puppet::Node::Facts.stubs(:cache_class=)
+            Puppet::Node.stubs(:cache_class=)
+            Puppet.features.stubs(:rails?).returns true
+        end
+
+        it "should set storeconfigs to true" do
+            Puppet.settings[:async_storeconfigs] = true
+            Puppet.settings[:storeconfigs].should be_true
+        end
+
+        it "should set the Catalog cache class to :queue" do
+            Puppet::Resource::Catalog.expects(:cache_class=).with(:queue)
+            Puppet.settings[:async_storeconfigs] = true
+        end
+
+        it "should set the Facts cache class to :active_record" do
+            Puppet::Node::Facts.expects(:cache_class=).with(:active_record)
+            Puppet.settings[:storeconfigs] = true
+        end
+
+        it "should set the Node cache class to :active_record" do
+            Puppet::Node.expects(:cache_class=).with(:active_record)
+            Puppet.settings[:storeconfigs] = true
+        end
+    end
+
+    describe "when enabling thin storeconfigs" do
+        before do
+            Puppet::Resource::Catalog.stubs(:cache_class=)
+            Puppet::Node::Facts.stubs(:cache_class=)
+            Puppet::Node.stubs(:cache_class=)
+            Puppet.features.stubs(:rails?).returns true
+        end
+
+        it "should set storeconfigs to true" do
+            Puppet.settings[:thin_storeconfigs] = true
+            Puppet.settings[:storeconfigs].should be_true
+        end
+    end
+
+    it "should have a setting for determining the configuration version and should default to an empty string" do
+        Puppet.settings[:config_version].should == ""
+    end
+    
+    describe "when enabling reports" do
+        it "should use the default server value when report server is unspecified" do
+            Puppet.settings[:server] = "server"
+            Puppet.settings[:report_server].should == "server"
+        end
+        
+        it "should use the default masterport value when report port is unspecified" do
+            Puppet.settings[:masterport] = "1234"
+            Puppet.settings[:report_port].should == "1234"
+        end
+
+        it "should set report_server when reportserver is set" do
+            Puppet.settings[:reportserver] = "reportserver"
+            Puppet.settings[:report_server].should == "reportserver"
+        end
+        
+        it "should use report_port when set" do
+            Puppet.settings[:masterport] = "1234"
+            Puppet.settings[:report_port] = "5678"
+            Puppet.settings[:report_port].should == "5678"
+        end
+        
+        it "should prefer report_server over reportserver" do
+            Puppet.settings[:reportserver] = "reportserver"
+            Puppet.settings[:report_server] = "report_server"
+            Puppet.settings[:report_server].should == "report_server"
+        end
+    end
 end