puppet 0.24.9 → 0.25.0

data/examples/modules/sample-module/manifests/init.pp

@@ -1,12 +1,12 @@
 # Jeff McCune <jeff.mccune@northstarlabs.net>
-# 
+#
 # Demonstration of a custom parser function and erb template within
 # a module, working in concert.
 
 class sample-module {
   $fqdn_to_dn = hostname_to_dn($domain)
   $sample_template = template("sample-module/sample.erb")
-  
+
   notice("hostname_to_dn module function returned: [$fqdn_to_dn]")
   info("sample.erb looks like:\n$sample_template")
 }

data/examples/relationships

@@ -28,7 +28,7 @@ define sleeper {
 
 files { }
 
-sleeper { 
+sleeper {
     require => files["yay"],
     schedule => true
 }

data/ext/autotest/config

@@ -5,7 +5,7 @@ require 'autotest/redgreen'
 require 'autotest/timestamp'
 
 Autotest.send(:alias_method, :real_find_files, :find_files)
-Autotest.send(:define_method, :find_files) do |*args| 
+Autotest.send(:define_method, :find_files) do |*args|
   real_find_files.reject do |k, v|
     if (ENV['AUTOTEST'] and !ENV['AUTOTEST'].empty?)
       !Regexp.new(ENV['AUTOTEST']).match(k)
@@ -15,19 +15,19 @@ end
 
 module Autotest::Growl
 
-  def self.growl title, msg, img, pri=0, sticky="" 
-    system "growlnotify -n autotest --image #{img} -p #{pri} -m #{msg.inspect} #{title} #{sticky}" 
+  def self.growl title, msg, img, pri=0, sticky=""
+    system "growlnotify -n autotest --image #{img} -p #{pri} -m #{msg.inspect} #{title} #{sticky}"
   end
 
   Autotest.add_hook :ran_command do |at|
-    image_root = "~/.autotest_images" 
+    image_root = "~/.autotest_images"
     results = [at.results].flatten.join("\n")
     output = results.slice(/(\d+)\stests,\s(\d+)\sassertions,\s(\d+)\sfailures,\s(\d+)\serrors/)
     if output
       if $~[3].to_i > 0 || $~[4].to_i > 0
         growl "FAIL", "#{output}", "#{image_root}/fail.png", 2
       else
-        growl "Pass", "#{output}", "#{image_root}/pass.png" 
+        growl "Pass", "#{output}", "#{image_root}/pass.png"
       end
     end
 
@@ -36,7 +36,7 @@ module Autotest::Growl
       if $~[2].to_i > 0 || $~[4].to_i > 0
         growl "FAIL", "#{output}", "#{image_root}/fail.png", 2
       else
-        growl "Pass", "#{output}", "#{image_root}/pass.png" 
+        growl "Pass", "#{output}", "#{image_root}/pass.png"
       end
     end
   end

data/ext/bin/sleeper

@@ -38,20 +38,20 @@ end
 debug = false
 
 result = GetoptLong.new(
-	[ "--debug",	"-d",			GetoptLong::NO_ARGUMENT ],
-	[ "--help",		"-h",			GetoptLong::NO_ARGUMENT ]
+    [ "--debug", "-d", GetoptLong::NO_ARGUMENT ],
+    [ "--help",  "-h", GetoptLong::NO_ARGUMENT ]
 )
 
 result.each { |opt,arg|
-	case opt
-		when "--help"
-			puts "There is no help yet"
-			exit
-		when "--debug"
-			debug = true
-		else
-			raise "Invalid option '#{opt}'"
-	end
+    case opt
+    when "--help"
+        puts "There is no help yet"
+        exit
+    when "--debug"
+        debug = true
+    else
+        raise "Invalid option '#{opt}'"
+    end
 }
 
 trap(:INT) {
@@ -59,7 +59,7 @@ trap(:INT) {
 }
 
 unless debug
-	daemonize()
+    daemonize()
 end
 
 # Sleep for no more than two minutes

data/ext/dbfix.sql

@@ -1,5 +1,5 @@
 -- MySQL DB consistency check/fix
--- 
+--
 -- Usage:
 -- cat dbfix.sql | mysql -u user -p puppet
 --
@@ -13,11 +13,11 @@ FROM resources AS bad_rows
     FROM resources
     GROUP BY title,restype,host_id
     HAVING count(*) > 1
-  ) AS good_rows 
-  ON 
-    good_rows.title = bad_rows.title AND 
-    good_rows.restype = bad_rows.restype AND 
-    good_rows.host_id = bad_rows.host_id AND 
+  ) AS good_rows
+  ON
+    good_rows.title = bad_rows.title AND
+    good_rows.restype = bad_rows.restype AND
+    good_rows.host_id = bad_rows.host_id AND
     good_rows.max_id <> bad_rows.id;
 
 -- Remove duplicate param_values, and keep the latest one
@@ -28,17 +28,17 @@ FROM param_values AS bad_rows
     FROM param_values
     GROUP BY value,param_name_id,resource_id
     HAVING count(*) > 1
-  ) AS good_rows 
-  ON 
-    good_rows.value = bad_rows.value AND 
-    good_rows.param_name_id = bad_rows.param_name_id AND 
-    good_rows.resource_id = bad_rows.resource_id AND 
+  ) AS good_rows
+  ON
+    good_rows.value = bad_rows.value AND
+    good_rows.param_name_id = bad_rows.param_name_id AND
+    good_rows.resource_id = bad_rows.resource_id AND
     good_rows.max_id <> bad_rows.id;
 
 -- rewrite param_values that points to duplicated param_names
 -- to point to the highest param_name id.
-UPDATE 
-  param_values v 
+UPDATE
+  param_values v
   INNER JOIN
   param_names n
   ON n.id = v.param_name_id
@@ -60,8 +60,8 @@ FROM param_names AS bad_rows
     FROM param_names
     GROUP BY name
     HAVING count(*) > 1
-  ) AS good_rows 
-  ON 
+  ) AS good_rows
+  ON
     good_rows.name = bad_rows.name AND
     good_rows.max_id <> bad_rows.id;
 
@@ -73,16 +73,16 @@ FROM resource_tags AS bad_rows
     FROM resource_tags
     GROUP BY resource_id,puppet_tag_id
     HAVING count(*) > 1
-  ) AS good_rows 
-  ON 
+  ) AS good_rows
+  ON
     good_rows.resource_id = bad_rows.resource_id AND
     good_rows.puppet_tag_id = bad_rows.puppet_tag_id AND
     good_rows.max_id <> bad_rows.id;
 
 -- rewrite resource_tags that points to duplicated puppet_tags
 -- to point to the highest puppet_tags id.
-UPDATE 
-  resource_tags v 
+UPDATE
+  resource_tags v
   INNER JOIN
   puppet_tags n
   ON n.id = v.puppet_tag_id
@@ -104,8 +104,8 @@ FROM puppet_tags AS bad_rows
     FROM puppet_tags
     GROUP BY name
     HAVING count(*) > 1
-  ) AS good_rows 
-  ON 
+  ) AS good_rows
+  ON
     good_rows.name = bad_rows.name AND
     good_rows.max_id <> bad_rows.id;
 

data/ext/emacs/puppet-mode.el

@@ -1,6 +1,6 @@
 ;;;
 ;;; puppet-mode.el
-;;; 
+;;;
 ;;; Author: lutter
 ;;; Author: Russ Allbery <rra@stanford.edu>
 ;;;
@@ -30,22 +30,23 @@
 
 (defvar puppet-mode-syntax-table
   (let ((table (make-syntax-table)))
-    (modify-syntax-entry ?\' "\"" table)
-    (modify-syntax-entry ?\" "\"" table)
-    (modify-syntax-entry ?#  "<"  table)
-    (modify-syntax-entry ?\n ">"  table)
-    (modify-syntax-entry ?\\ "\\" table)
-    (modify-syntax-entry ?$  "."  table)
-    (modify-syntax-entry ?-  "_"  table)
-    (modify-syntax-entry ?>  "."  table)
-    (modify-syntax-entry ?=  "."  table)
-    (modify-syntax-entry ?\; "."  table)
-    (modify-syntax-entry ?\( "()" table)
-    (modify-syntax-entry ?\) ")(" table)
-    (modify-syntax-entry ?\{ "(}" table)
-    (modify-syntax-entry ?\} "){" table)
-    (modify-syntax-entry ?\[ "(]" table)
-    (modify-syntax-entry ?\] ")[" table)
+    (modify-syntax-entry ?\' "\"'"  table)
+    (modify-syntax-entry ?\" "\"\"" table)
+    (modify-syntax-entry ?#  "<"    table)
+    (modify-syntax-entry ?\n ">#"   table)
+    (modify-syntax-entry ?\\ "\\"   table)
+    (modify-syntax-entry ?$  "'"    table)
+    (modify-syntax-entry ?-  "_"    table)
+    (modify-syntax-entry ?:  "_"    table)
+    (modify-syntax-entry ?>  "."    table)
+    (modify-syntax-entry ?=  "."    table)
+    (modify-syntax-entry ?\; "."    table)
+    (modify-syntax-entry ?\( "()"   table)
+    (modify-syntax-entry ?\) ")("   table)
+    (modify-syntax-entry ?\{ "(}"   table)
+    (modify-syntax-entry ?\} "){"   table)
+    (modify-syntax-entry ?\[ "(]"   table)
+    (modify-syntax-entry ?\] ")["   table)
     table)
   "Syntax table in use in puppet-mode buffers.")
 
@@ -151,23 +152,23 @@ of the initial include plus puppet-include-indent."
         ;; Indent the line to the same indentation as the first
         ;; element in that array.  That is, this...
         ;;
-        ;;    exec {     
+        ;;    exec {
         ;;      "add_puppetmaster_mongrel_startup_links":
         ;;      command => "string1",
-        ;;      creates => [ "string2", "string3", 
-        ;;      "string4", "string5", 
+        ;;      creates => [ "string2", "string3",
+        ;;      "string4", "string5",
         ;;      "string6", "string7",
         ;;      "string3" ],
         ;;      refreshonly => true,
         ;;    }
-        ;; 
+        ;;
         ;; ...should instead look like this:
         ;;
-        ;;    exec {     
+        ;;    exec {
         ;;      "add_puppetmaster_mongrel_startup_links":
         ;;      command => "string1",
-        ;;      creates => [ "string2", "string3", 
-        ;;                   "string4", "string5", 
+        ;;      creates => [ "string2", "string3",
+        ;;                   "string4", "string5",
         ;;                   "string6", "string7",
         ;;                   "string8" ],
         ;;      refreshonly => true,
@@ -180,10 +181,10 @@ of the initial include plus puppet-include-indent."
           (setq cur-indent (current-column))))
        (include-start
         (setq cur-indent include-start))
-       ((and (looking-at "^\\s-*}\\s-*$") block-indent)
-        ;; This line contains only a closing brace and we're at the inner
-        ;; block, so we should indent it matching the indentation of the
-        ;; opening brace of the block.
+       ((and (looking-at "^\\s-*},?\\s-*$") block-indent)
+        ;; This line contains a closing brace or a closing brace followed by a
+        ;; comma and we're at the inner block, so we should indent it matching
+        ;; the indentation of the opening brace of the block.
         (setq cur-indent block-indent))
        (t
         ;; Otherwise, we did not start on a block-ending-only line.
@@ -204,10 +205,10 @@ of the initial include plus puppet-include-indent."
               (setq cur-indent (current-indentation))
               (setq not-indented nil))
 
-             ;; Brace or paren not on a line by itself will be indented one
-             ;; level too much, but don't catch cases where the block is
-             ;; started and closed on the same line.
-             ((looking-at "^[^\n\({]*[\)}]\\s-*$")
+             ;; Brace (possibly followed by a comma) or paren not on a line by
+             ;; itself will be indented one level too much, but don't catch
+             ;; cases where the block is started and closed on the same line.
+             ((looking-at "^[^\n\({]*[\)}],?\\s-*$")
               (setq cur-indent (- (current-indentation) puppet-indent-level))
               (setq not-indented nil))
 
@@ -215,12 +216,12 @@ of the initial include plus puppet-include-indent."
              ;; if there is more than one block opened and closed on the same
              ;; line but it's still unbalanced; hopefully people don't do that.
              ((looking-at "^.*{[^\n}]*$")
-              (setq cur-indent (+ (current-indentation) puppet-indent-level)) 
+              (setq cur-indent (+ (current-indentation) puppet-indent-level))
               (setq not-indented nil))
 
              ;; Indent by one level if the line ends with an open paren.
              ((looking-at "^.*\(\\s-*$")
-              (setq cur-indent (+ (current-indentation) puppet-indent-level)) 
+              (setq cur-indent (+ (current-indentation) puppet-indent-level))
               (setq not-indented nil))
 
              ;; Semicolon ends a block for a resource when multiple resources
@@ -307,15 +308,13 @@ of the initial include plus puppet-include-indent."
      ;; variables
      '("\\(^\\|[^_:.@$]\\)\\b\\(true\\|false\\)\\>"
        2 font-lock-variable-name-face)
-     '("\\(\\$\\([^a-zA-Z0-9 \n]\\|[0-9]\\)\\)\\W"
-       1 font-lock-variable-name-face)
-     '("\\(\\$\\|@\\|@@\\)\\(\\w\\|_\\|:\\)+"
+     '("\\$[a-zA-Z0-9_:]+"
        0 font-lock-variable-name-face)
      ;; usage of types
-     '("^\\s *\\([a-zA-Z_-]+\\)\\s +{"
+     '("^\\s *\\([a-z][a-zA-Z0-9_:-]*\\)\\s +{"
        1 font-lock-type-face)
      ;; overrides and type references
-     '("\\s +\\([A-Z][a-zA-Z_:-]*\\)\\["
+     '("\\s +\\([A-Z][a-zA-Z0-9_:-]*\\)\\["
        1 font-lock-type-face)
      ;; general delimited string
      '("\\(^\\|[[ \t\n<+(,=]\\)\\(%[xrqQwW]?\\([^<[{(a-zA-Z0-9 \n]\\)[^\n\\\\]*\\(\\\\.[^\n\\\\]*\\)*\\(\\3\\)\\)"
@@ -337,14 +336,16 @@ The variable puppet-indent-level controls the amount of indentation.
   (set (make-local-variable 'local-abbrev-table) puppet-mode-abbrev-table)
   (set (make-local-variable 'comment-start) "# ")
   (set (make-local-variable 'comment-start-skip) "#+ *")
+  (set (make-local-variable 'comment-use-syntax) t)
   (set (make-local-variable 'comment-end) "")
+  (set (make-local-variable 'comment-auto-fill-only-comments) t)
   (set (make-local-variable 'comment-column) puppet-comment-column)
   (set (make-local-variable 'indent-line-function) 'puppet-indent-line)
   (set (make-local-variable 'indent-tabs-mode) puppet-indent-tabs-mode)
   (set (make-local-variable 'require-final-newline) t)
   (set (make-local-variable 'paragraph-ignore-fill-prefix) t)
-  (set (make-local-variable 'paragraph-start) "\f\\|[ 	]*$")
-  (set (make-local-variable 'paragraph-separate) "[ 	\f]*$")
+  (set (make-local-variable 'paragraph-start) "\f\\|[ 	]*$\\|#$")
+  (set (make-local-variable 'paragraph-separate) "\\([ 	\f]*\\|#\\)$")
   (or (boundp 'font-lock-variable-name-face)
       (setq font-lock-variable-name-face font-lock-type-face))
   (set (make-local-variable 'font-lock-keywords) puppet-font-lock-keywords)

data/ext/extlookup.rb

@@ -0,0 +1,183 @@
+# 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 
+# magically loading data in when an module is loaded I prefer to look at the code
+# and see statements like:
+#
+#     $snmp_contact = extlookup("snmp_contact")
+#
+# The above snippet will load the snmp_contact value from CSV files, this in its
+# own is useful but a common construct in puppet manifests is something like this:
+#
+# case $domain {
+#      "myclient.com": { $snmp_contact = "John Doe <john@myclient.com>" }
+#      default:        { $snmp_contact = "My Support <support@my.com>" }
+# }
+#
+# Over time there will be a lot of this kind of thing spread all over your manifests
+# and adding an additional client involves grepping through manifests to find all the
+# places where you have constructs like this.
+#
+# This is a data problem and shouldn't be handled in code, a using this function you
+# can do just that.
+#
+# First you configure it in site.pp:
+# $extlookup_datadir = "/etc/puppet/manifests/extdata"
+# $extlookup_precedence = ["%{fqdn}", "domain_%{domain}", "common"]
+#
+# The array tells the code how to resolve values, first it will try to find it in
+# web1.myclient.com.csv then in domain_myclient.com.csv and finally in common.csv
+#
+# Now create the following data files in /etc/puppet/manifests/extdata
+#
+# 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
+#
+# common.csv:
+#    snmp_contact,My Support <support@my.com>
+#    root_contact,support@my.com
+#
+# Now you can replace the case statement with the simple single line to achieve
+# the exact same outcome:
+#
+#    $snmp_contact = extlookup("snmp_contact")
+#
+# 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.
+#
+# In the event that a variable is nowhere to be found a critical error will be raised
+# that will prevent your manifest from compiling, this is to avoid accidentally putting
+# 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 
+# any data file.
+#
+# You can also specify an additional data file to search first before any others at use
+# time, for example:
+#
+# $version = extlookup("rsyslog_version", "present", "packages")
+#
+# package{"rsyslog": ensure => $version }
+#
+# This will look for a version configured in packages.csv and then in the rest as configured
+# by $extlookup_precedence if it's not found anywhere it will default to "present", this kind
+# of use case makes puppet a lot nicer for managing large amounts of packages since you do not
+# 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://reductivelabs.com/trac/puppet/wiki/WritingYourOwnFunctions
+#
+# 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
+
+            extlookup_precedence << prec
+        end
+    
+
+        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
+
+        extlookup_precedence.each do |d|
+            datafiles << extlookup_datadir + "/#{d}.csv"
+        end
+
+        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
+                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_"
+        end
+
+        desired
+    end
+end
+
+# vi:tabstop=4:expandtab:ai