puppet 0.25.5 → 2.6.0

data/conf/redhat/puppet.conf

@@ -11,7 +11,7 @@
     # The default value is '$confdir/ssl'.
     ssldir = $vardir/ssl
 
-[puppetd]
+[agent]
     # 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``

data/conf/redhat/puppet.spec

@@ -12,7 +12,7 @@ License:        GPLv2+
 URL:            http://puppetlabs.com
 Source0:        http://puppetlabs.com/downloads/%{name}/%{name}-%{version}.tar.gz
 Source1:        http://puppetlabs.com/downloads/%{name}/%{name}-%{version}.tar.gz.sign
-
+Patch0:         rundir-perms.patch
 Group:          System Environment/Base
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

data/conf/redhat/rundir-perms.patch

@@ -1,6 +1,6 @@
-From 9c4f335261aa48b6a2b82e91d4d6fcd95f030d09 Mon Sep 17 00:00:00 2001
+From b153b4d234cd015efb52a5db8075350a75506668 Mon Sep 17 00:00:00 2001
 From: Jeroen van Meeuwen (Fedora Unity) <kanarip@fedoraunity.org>
-Date: Fri, 4 Sep 2009 09:13:19 -0400
+Date: Sat, 10 Jul 2010 14:44:04 -0400
 Subject: [PATCH/puppet] Tighten rundir perms (rhbz #495096)
 
 The loose default permissions are not required for Red Hat systems
@@ -11,18 +11,18 @@ service user/group.
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb
-index 3a0feec..3132830 100644
+index 0af40f2..71027d6 100644
 --- a/lib/puppet/defaults.rb
 +++ b/lib/puppet/defaults.rb
-@@ -62,7 +62,7 @@ module Puppet
-         },
-         :rundir => {
-             :default => rundir,
--            :mode => 01777,
-+            :mode => 0755,
-             :desc => "Where Puppet PID files are kept."
-         },
-         :genconfig => [false,
+@@ -26,7 +26,7 @@ module Puppet
+     },
+     :rundir => {
+       :default => Puppet.run_mode.run_dir,
+-      :mode => 01777,
++      :mode => 0755,
+       :desc => "Where Puppet PID files are kept."
+     },
+     :genconfig => [false,
 -- 
-1.6.4.2
+1.7.1
 

data/conf/redhat/server.init

@@ -13,7 +13,7 @@ PATH=/usr/bin:/sbin:/bin:/usr/sbin
 export PATH
 
 lockfile=/var/lock/subsys/puppetmaster
-pidfile=/var/run/puppet/puppetmasterd.pid
+pidfile=/var/run/puppet/master.pid
 
 # Source function library.
 . /etc/rc.d/init.d/functions
@@ -33,6 +33,13 @@ fi
 PUPPETMASTER_OPTS="${PUPPETMASTER_OPTS} \
     ${PUPPETMASTER_EXTRA_OPTS}"
 
+# Determine if we can use the -p option to daemon, killproc, and status.
+# RHEL < 5 can't.
+if status | grep -q -- '-p' 2>/dev/null; then
+    daemonopts="--pidfile $pidfile"
+    pidopts="-p $pidfile"
+fi
+
 RETVAL=0
 
 prog=puppetmasterd
@@ -50,7 +57,7 @@ start() {
                 ret=$?; [ $ret != 0 ] && RETVAL=$ret
             done
         else
-            daemon $PUPPETMASTER $PUPPETMASTER_OPTS
+            daemon $daemonopts $PUPPETMASTER $PUPPETMASTER_OPTS
             RETVAL=$?
         fi
     else
@@ -72,8 +79,7 @@ stop() {
             ret=$?; [ $ret != 0 ] && RETVAL=$ret
         done
     else
-        killproc | grep -q -- '-p' 2>/dev/null && killopts="-p $pidfile"
-        killproc $killopts $PUPPETMASTER
+        killproc $pidopts $PUPPETMASTER
         RETVAL=$?
     fi
     echo
@@ -99,7 +105,7 @@ rh_status() {
             ret=$?; [ $ret != 0 ] && RETVAL=$ret
         done
     else
-        status $PUPPETMASTER
+        status $pidopts $PUPPETMASTER
         RETVAL=$?
     fi
     return $RETVAL

data/conf/solaris/pkginfo

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

data/conf/solaris/smf/puppetd.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
 
-<!-- Puppetd Manifest: Luke Kanies - puppetlabs.com -->
+<!-- Puppetd Manifest: Luke Kanies - reductivelabs.com -->
 
 <service_bundle type='manifest' name='puppetd'>
 
@@ -68,8 +68,8 @@
         </common_name>
         <documentation>
             <manpage title='puppetd' section='1' />
-            <doc_link name='puppetlabs.com'
-                uri='http://www.puppetlabs.com/projects/puppet' />
+            <doc_link name='reductivelabs.com'
+                uri='http://www.reductivelabs.com/projects/puppet' />
         </documentation>
     </template>
 </service>

data/conf/solaris/smf/puppetmasterd.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
 
-<!-- PuppetMasterd Manifest: Luke Kanies - puppetlabs.com -->
+<!-- PuppetMasterd Manifest: Luke Kanies - reductivelabs.com -->
 
 <service_bundle type='manifest' name='puppetmasterd'>
 
@@ -68,8 +68,8 @@
         </common_name>
         <documentation>
             <manpage title='puppetmasterd' section='1' />
-            <doc_link name='puppetlabs.com'
-                uri='http://www.puppetlabs.com/projects/puppet' />
+            <doc_link name='reductivelabs.com'
+                uri='http://www.reductivelabs.com/projects/puppet' />
         </documentation>
     </template>
 </service>

data/conf/suse/client.init

@@ -14,8 +14,9 @@
 ### BEGIN INIT INFO
 # Provides: puppet
 # Required-Start: $local_fs $network $syslog
-# Should-Start:
-# Required-Stop:
+# Should-Start: $null
+# Required-Stop: $null
+# Should-Stop: $null
 # Default-Start: 3 4 5
 # Default-Stop: 0 1 2 6
 # Short-Description: puppet

data/conf/suse/puppet.spec

@@ -10,8 +10,8 @@ Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
 
-URL: http://puppetlabs.com/projects/puppet/
-Source: http://puppetlabs.com/downloads/puppet/%{name}-%{version}.tar.gz
+URL: http://reductivelabs.com/projects/puppet/
+Source: http://reductivelabs.com/downloads/puppet/%{name}-%{version}.tar.gz
 Patch0: puppet.suse.patch
 Requires: ruby >= 1.8.2
 Requires: facter >= 1.3.7
@@ -43,7 +43,6 @@ for f in bin/* ; do
 done
 
 %install
-%{__rm} -rf %{buildroot}
 %{__install} -d -m0755 %{buildroot}%{_sbindir}
 %{__install} -d -m0755 %{buildroot}%{_bindir}
 %{__install} -d -m0755 %{buildroot}%{ruby_sitelibdir}
@@ -52,36 +51,41 @@ done
 %{__install} -d -m0755 %{buildroot}%{_localstatedir}/lib/puppet
 %{__install} -d -m0755 %{buildroot}%{_localstatedir}/run/puppet
 %{__install} -d -m0755 %{buildroot}%{_localstatedir}/log/puppet
-%{__install} -Dp -m0755 %{pbuild}/bin/* %{pbuild}/sbin/* %{buildroot}%{_sbindir}
+%{__install} -Dp -m0755 %{pbuild}/bin/* %{buildroot}%{_sbindir}
+%{__install} -Dp -m0755 %{pbuild}/sbin/* %{buildroot}%{_sbindir}
 %{__mv} %{buildroot}%{_sbindir}/puppet %{buildroot}%{_bindir}/puppet
 %{__mv} %{buildroot}%{_sbindir}/puppetrun %{buildroot}%{_bindir}/puppetrun
-%{__mv} %{buildroot}%{_sbindir}/pi %{buildroot}%{_bindir}/pi
-%{__mv} %{buildroot}%{_sbindir}/filebucket %{buildroot}%{_bindir}/filebucket
 %{__install} -Dp -m0644 %{pbuild}/lib/puppet.rb %{buildroot}%{ruby_sitelibdir}/puppet.rb
 %{__cp} -a %{pbuild}/lib/puppet %{buildroot}%{ruby_sitelibdir}
-find %{buildroot}%{ruby_sitelibdir} -type f -perm +ugo+x -print0 | xargs -0 -r %{__chmod} a-x
-%{__install} -Dp -m0644 %{confdir}/client.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/puppet
-%{__install} -Dp -m0755 %{suseconfdir}/client.init %{buildroot}%{_initrddir}/puppet
-%{__install} -Dp -m0644 %{confdir}/server.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/puppetmaster
-%{__install} -Dp -m0755 %{suseconfdir}/server.init %{buildroot}%{_initrddir}/puppetmaster
+find %{buildroot}%{ruby_sitelibdir} -type f -perm +ugo+x -exec chmod a-x '{}' \;
+%{__install} -Dp -m0644 %{confdir}/client.sysconfig %{buildroot}/var/adm/fillup-templates/sysconfig.puppet
+%{__install} -Dp -m0755 %SOURCE1 %{buildroot}%{_initrddir}/puppet
+%{__install} -Dp -m0644 %{confdir}/server.sysconfig %{buildroot}/var/adm/fillup-templates/sysconfig.puppetmaster
+%{__install} -Dp -m0755 %SOURCE2 %{buildroot}%{_initrddir}/puppetmaster
 %{__install} -Dp -m0644 %{confdir}/fileserver.conf %{buildroot}%{_sysconfdir}/puppet/fileserver.conf
 %{__install} -Dp -m0644 %{confdir}/puppet.conf %{buildroot}%{_sysconfdir}/puppet/puppet.conf
+#%{__ln_s} puppet.conf %{buildroot}%{_sysconfdir}/puppet/puppetmasterd.conf
+#%{__ln_s} puppet.conf %{buildroot}%{_sysconfdir}/puppet/puppetca.conf
 %{__install} -Dp -m0644 %{confdir}/logrotate %{buildroot}%{_sysconfdir}/logrotate.d/puppet
+%{__ln_s}  %{_initrddir}/puppet %{buildroot}%{_sbindir}/rcpuppet
+%{__ln_s}  %{_initrddir}/puppetmaster %{buildroot}%{_sbindir}/rcpuppetmaster
 
 %files
 %defattr(-, root, root, 0755)
 %{_bindir}/puppet
-%{_bindir}/pi
-%{_bindir}/filebucket
+%{_sbindir}/filebucket
 %{_sbindir}/ralsh
 %{_sbindir}/puppetd
+%{_sbindir}/rcpuppet
+%{_sbindir}/pi
 %{ruby_sitelibdir}/*
 %{_initrddir}/puppet
-%config(noreplace) %{_sysconfdir}/sysconfig/puppet
+/var/adm/fillup-templates/sysconfig.puppet
 %config(noreplace) %{_sysconfdir}/puppet/puppet.conf
 %doc CHANGELOG COPYING LICENSE README examples
 %exclude %{_sbindir}/puppetdoc
 %config(noreplace) %{_sysconfdir}/logrotate.d/puppet
+%dir %{_sysconfdir}/puppet
 # These need to be owned by puppet so the server can
 # write to them
 %attr(-, puppet, puppet) %{_localstatedir}/run/puppet
@@ -152,7 +156,7 @@ fi
 
 * Mon Jun 19 2006 David Lutterkort <dlutter@redhat.com> - 0.18.0-1
 - Patch config for LSB compliance (lsb-config.patch)
-- Changed config moves /var/puppet to /var/lib/puppet, /etc/puppet/ssl
+- Changed config moves /var/puppet to /var/lib/puppet, /etc/puppet/ssl 
   to /var/lib/puppet, /etc/puppet/clases.txt to /var/lib/puppet/classes.txt,
   /etc/puppet/localconfig.yaml to /var/lib/puppet/localconfig.yaml
 
@@ -175,7 +179,7 @@ fi
 - Rebuilt for new version
 
 * Wed Mar 22 2006 David Lutterkort <dlutter@redhat.com> - 0.15.1-1
-- Patch0: Run puppetmaster as root; running as puppet is not ready
+- Patch0: Run puppetmaster as root; running as puppet is not ready 
   for primetime
 
 * Mon Mar 13 2006 David Lutterkort <dlutter@redhat.com> - 0.15.0-1
@@ -190,7 +194,7 @@ fi
   allocate the puppet uid/gid dynamically
 
 * Sun Feb 19 2006 David Lutterkort <dlutter@redhat.com> - 0.13.0-4
-- Use fedora-usermgmt to create puppet user/group. Use uid/gid 24. Fixed
+- Use fedora-usermgmt to create puppet user/group. Use uid/gid 24. Fixed 
 problem with listing fileserver.conf and puppetmaster.conf twice
 
 * Wed Feb  8 2006 David Lutterkort <dlutter@redhat.com> - 0.13.0-3
@@ -215,7 +219,7 @@ problem with listing fileserver.conf and puppetmaster.conf twice
 - Added basic fileserver.conf
 
 * Wed Jan 11 2006 David Lutterkort <dlutter@redhat.com> - 0.10.1-1
-- Updated. Moved installation of library files to sitelibdir. Pulled
+- Updated. Moved installation of library files to sitelibdir. Pulled 
 initscripts into separate files. Folded tools rpm into server
 
 * Thu Nov 24 2005 Duane Griffin <d.griffin@psenterprise.com>

data/conf/suse/server.init

@@ -12,8 +12,9 @@
 ### BEGIN INIT INFO
 # Provides: puppetmaster
 # Required-Start: $local_fs $network $syslog
-# Should-Start:
-# Required-Stop:
+# Should-Start: $null
+# Required-Stop: $null
+# Should-Stop: $null
 # Default-Start: 3 4 5
 # Default-Stop: 0 1 2 6
 # Short-Description: puppetmaster
@@ -39,16 +40,16 @@ if [ -f /etc/sysconfig/puppetmaster ]; then
     . /etc/sysconfig/puppetmaster
 fi
 
-[ -z "$PUPPETMASTER_MANIFEST" ] && PUPPETMASTER_MANIFEST=/etc/puppet/manifests/site.pp
-[ -z "$PUPPETMASTER_LOG" ] && PUPPETMASTER_LOG="/var/log/puppet/puppetmaster.log"
-PUPPETMASTER_OPTS="
-    --manifest=$PUPPETMASTER_MANIFEST \
-    --logdest=${PUPPETMASTER_LOG} \
+PUPPETMASTER_OPTS=""
+[ -n "$PUPPETMASTER_MANIFEST" ] && PUPPETMASTER_OPTS="--manifest=${PUPPETMASTER_MANIFEST}"
+if [ -n "$PUPPETMASTER_PORTS" ] && [ ${#PUPPETMASTER_PORTS[@]} -gt 1 ]; then
+    PUPPETMASTER_OPTS="$PUPPETMASTER_OPTS --servertype=mongrel"
+elif [ -n "$PUPPETMASTER_PORTS" ] && [ ${#PUPPETMASTER_PORTS[@]} -eq 1 ]; then
+    PUPPETMASTER_OPTS="${PUPPETMASTER_OPTS} --masterport=${PUPPETMASTER_PORTS[0]}"
+fi
+[ -n "$PUPPETMASTER_LOG" ] && PUPPETMASTER_OPTS="${PUPPETMASTER_OPTS} --logdest ${PUPPETMASTER_LOG}"
+PUPPETMASTER_OPTS="${PUPPETMASTER_OPTS} \
     ${PUPPETMASTER_EXTRA_OPTS}"
-PUPPET_OPTS=""
-[ -n "${PUPPET_SERVER}" ] && PUPPET_OPTS="--server=${PUPPET_SERVER}"
-[ -n "$PUPPET_LOG" ] && PUPPET_OPTS="${PUPPET_OPTS} --logdest=${PUPPET_LOG}"
-[ -n "$PUPPET_PORT" ] && PUPPET_OPTS="${PUPPET_OPTS} --port=${PUPPET_PORT}"
 
 prog=puppetmasterd
 PUPPETMASTER=/usr/sbin/$prog

data/examples/modules/sample-module/README.txt

@@ -12,6 +12,6 @@ templates/sample.erb
 Note the consistent naming of files for Puppet::Util::Autoload
 
 Reference Documents:
-http://puppetlabs.com/trac/puppet/wiki/ModuleOrganisation
-http://puppetlabs.com/trac/puppet/wiki/WritingYourOwnFunctions
-http://puppetlabs.com/trac/puppet/wiki/FunctionReference
+http://reductivelabs.com/trac/puppet/wiki/ModuleOrganisation
+http://docs.puppetlabs.com/guides/custom_functions.html
+http://reductivelabs.com/trac/puppet/wiki/FunctionReference

data/examples/modules/sample-module/lib/puppet/parser/functions/hostname_to_dn.rb

@@ -27,10 +27,10 @@
 
 # Jeff McCune <jeff.mccune@northstarlabs.net>
 # 2007-08-14
-# See: http://puppetlabs.com/trac/puppet/wiki/WritingYourOwnFunctions
+# See: http://docs.puppetlabs.com/guides/custom_functions.html
 
 module Puppet::Parser::Functions
-    newfunction(:hostname_to_dn, :type => :rvalue, :doc => "Given 'foo.bar.com', return 'dc=foo,dc=bar,dc=com'.") do |args|
-        args[0].split(/\./).map do |s| "dc=%s"%[s] end.join(",")
-    end
+  newfunction(:hostname_to_dn, :type => :rvalue, :doc => "Given 'foo.bar.com', return 'dc=foo,dc=bar,dc=com'.") do |args|
+    args[0].split(/\./).map do |s| "dc=#{s}" end.join(",")
+  end
 end

data/ext/extlookup.rb

@@ -1,10 +1,10 @@
-# Puppet External Data Sources 
+# Puppet External Data Sources
 #
 # This is a parser function to read data from external files, this version
 # uses CSV files but the concept can easily be adjust for databases, yaml
 # or any other queryable data source.
 #
-# The object of this is to make it obvious when it's being used, rather than 
+# The object of this is to make it obvious when it's being used, rather than
 # magically loading data in when an module is loaded I prefer to look at the code
 # and see statements like:
 #
@@ -34,7 +34,7 @@
 #
 # Now create the following data files in /etc/puppet/manifests/extdata
 #
-# domain_myclient.com.csv: 
+# domain_myclient.com.csv:
 #    snmp_contact,John Doe <john@myclient.com>
 #    root_contact,support@%{domain}
 #    client_trusted_ips,192.168.1.130,192.168.10.0/24
@@ -48,7 +48,7 @@
 #
 #    $snmp_contact = extlookup("snmp_contact")
 #
-# The obove code shows some other features, you can use any fact or variable that 
+# The obove code shows some other features, you can use any fact or variable that
 # is in scope by simply using %{varname} in your data files, you can return arrays
 # by just having multiple values in the csv after the initial variable name.
 #
@@ -57,8 +57,8 @@
 # in empty values etc.  You can however specify a default value:
 #
 #    $ntp_servers = extlookup("ntp_servers", "1.${country}.pool.ntp.org")
-# 
-# In this case it will default to "1.${country}.pool.ntp.org" if nothing is defined in 
+#
+# In this case it will default to "1.${country}.pool.ntp.org" if nothing is defined in
 # any data file.
 #
 # You can also specify an additional data file to search first before any others at use
@@ -74,110 +74,108 @@
 # need to edit a load of manifests to do simple things like adjust a desired version number.
 #
 # For more information on installing and writing your own custom functions see:
-#    http://puppetlabs.com/trac/puppet/wiki/WritingYourOwnFunctions
+#    http://docs.puppetlabs.com/guides/custom_functions.html
 #
 # For further help contact Volcane on #puppet
 require 'csv'
- 
+
 module Puppet::Parser::Functions
-    newfunction(:extlookup, :type => :rvalue) do |args|
-        key = args[0]
-        default = "_ExtUNSET_"
-        datafile = "_ExtUNSET_"
-
-        default = args[1] if args[1]
-        datafile = args[2] if args[2]
-
-        extlookup_datadir = lookupvar('extlookup_datadir')
-        extlookup_precedence = Array.new
-
-        # precedence values can have variables embedded in them
-        # in the form %{fqdn}, you could for example do
-        #
-        #    $extlookup_precedence = ["hosts/%{fqdn}", "common"]
-        #
-        # this will result in /path/to/extdata/hosts/your.box.com.csv
-        # being searched.
-        #
-        # we parse the precedence here because the best place to specify
-        # it would be in site.pp but site.pp is only evaluated at startup
-        # so $fqdn etc would have no meaning there, this way it gets evaluated
-        # each run and has access to the right variables for that run
-        lookupvar('extlookup_precedence').each do |prec|
-            while prec =~ /%\{(.+?)\}/
-                prec.gsub!(/%\{#{$1}\}/, lookupvar($1))
-            end
+  newfunction(:extlookup, :type => :rvalue) do |args|
+    key = args[0]
+    default = "_ExtUNSET_"
+    datafile = "_ExtUNSET_"
+
+    default = args[1] if args[1]
+    datafile = args[2] if args[2]
+
+    extlookup_datadir = lookupvar('extlookup_datadir')
+    extlookup_precedence = Array.new
+
+    # precedence values can have variables embedded in them
+    # in the form %{fqdn}, you could for example do
+    #
+    #    $extlookup_precedence = ["hosts/%{fqdn}", "common"]
+    #
+    # this will result in /path/to/extdata/hosts/your.box.com.csv
+    # being searched.
+    #
+    # we parse the precedence here because the best place to specify
+    # it would be in site.pp but site.pp is only evaluated at startup
+    # so $fqdn etc would have no meaning there, this way it gets evaluated
+    # each run and has access to the right variables for that run
+    lookupvar('extlookup_precedence').each do |prec|
+      while prec =~ /%\{(.+?)\}/
+        prec.gsub!(/%\{#{$1}\}/, lookupvar($1))
+      end
+
+      extlookup_precedence << prec
+    end
 
-            extlookup_precedence << prec
-        end
-    
 
-        datafiles = Array.new
+    datafiles = Array.new
 
-        # if we got a custom data file, put it first in the array of search files
-        if datafile != "" 
-            if File.exists?(extlookup_datadir + "/#{datafile}.csv")
-                datafiles << extlookup_datadir + "/#{datafile}.csv"
-            end
-        end
+    # if we got a custom data file, put it first in the array of search files
+    if datafile != ""
+      datafiles << extlookup_datadir + "/#{datafile}.csv" if File.exists?(extlookup_datadir + "/#{datafile}.csv")
+    end
 
-        extlookup_precedence.each do |d|
-            datafiles << extlookup_datadir + "/#{d}.csv"
-        end
+    extlookup_precedence.each do |d|
+      datafiles << extlookup_datadir + "/#{d}.csv"
+    end
+
+    desired = "_ExtUNSET_"
 
-        desired = "_ExtUNSET_"
-
-        datafiles.each do |file|
-            parser.watch_file(file) if File.exists?(file)
-
-            if desired == "_ExtUNSET_"
-                if File.exists?(file)
-                    result = CSV.read(file).find_all do |r|
-                        r[0] == key
-                    end
-    
-
-                    # return just the single result if theres just one,
-                    # else take all the fields in the csv and build an array
-                    if result.length > 0
-                        if result[0].length == 2
-                            val = result[0][1].to_s
-                            
-                            # parse %{}'s in the CSV into local variables using lookupvar()
-                            while val =~ /%\{(.+?)\}/
-                                val.gsub!(/%\{#{$1}\}/, lookupvar($1))
-                            end
-
-                            desired = val
-                        elsif result[0].length > 1
-                            length = result[0].length
-                            cells = result[0][1,length]
-    
-                            # Individual cells in a CSV result are a weird data type and throws
-                            # puppets yaml parsing, so just map it all to plain old strings
-                            desired = cells.map do |c|
-                                # parse %{}'s in the CSV into local variables using lookupvar()
-                                while c =~ /%\{(.+?)\}/
-                                    c.gsub!(/%\{#{$1}\}/, lookupvar($1))
-                                end
-
-                                c.to_s
-                            end
-                        end
-                    end
+    datafiles.each do |file|
+      parser.watch_file(file) if File.exists?(file)
+
+      if desired == "_ExtUNSET_"
+        if File.exists?(file)
+          result = CSV.read(file).find_all do |r|
+            r[0] == key
+          end
+
+
+          # return just the single result if theres just one,
+          # else take all the fields in the csv and build an array
+          if result.length > 0
+            if result[0].length == 2
+              val = result[0][1].to_s
+
+              # parse %{}'s in the CSV into local variables using lookupvar()
+              while val =~ /%\{(.+?)\}/
+                val.gsub!(/%\{#{$1}\}/, lookupvar($1))
+              end
+
+              desired = val
+            elsif result[0].length > 1
+              length = result[0].length
+              cells = result[0][1,length]
+
+              # Individual cells in a CSV result are a weird data type and throws
+              # puppets yaml parsing, so just map it all to plain old strings
+              desired = cells.map do |c|
+                # parse %{}'s in the CSV into local variables using lookupvar()
+                while c =~ /%\{(.+?)\}/
+                  c.gsub!(/%\{#{$1}\}/, lookupvar($1))
                 end
-            end
-        end
 
-        # don't accidently return nil's and such rather throw a parse error
-        if desired == "_ExtUNSET_" && default == "_ExtUNSET_"
-            raise Puppet::ParseError, "No match found for '#{key}' in any data file during extlookup()"
-        else 
-            desired = default if desired == "_ExtUNSET_"
+                c.to_s
+              end
+            end
+          end
         end
+      end
+    end
 
-        desired
+    # don't accidently return nil's and such rather throw a parse error
+    if desired == "_ExtUNSET_" && default == "_ExtUNSET_"
+      raise Puppet::ParseError, "No match found for '#{key}' in any data file during extlookup()"
+    else
+      desired = default if desired == "_ExtUNSET_"
     end
+
+    desired
+  end
 end
 
 # vi:tabstop=4:expandtab:ai