puppet 2.7.26 → 3.0.0.rc4

data/ext/nagios/naggen

@@ -277,7 +277,7 @@ result.each { |opt,arg|
 }
 
 # Read in Puppet settings, so we know how Puppet's configured.
-Puppet.parse_config
+Puppet.initialize_settings
 
 Puppet::Util::Log.newdestination(:console)
 

data/ext/puppet-test

@@ -542,7 +542,7 @@ rescue GetoptLong::InvalidOption => detail
 end
 
 # Now parse the config
-Puppet.parse_config
+Puppet.initialize_settings
 
 $options[:nodes] << Puppet.settings[:certname] if $options[:nodes].empty?
 

data/ext/puppetlisten/puppetlisten.rb

@@ -11,8 +11,7 @@ require 'socket'
 require 'facter'
 
 # load puppet configuration, needed to find SSL certificates
-Puppet[:config] = "/etc/puppet/puppet.conf"
-Puppet.parse_config
+Puppet.initialize_settings
 
 # set the SSL environment
 ctx = OpenSSL::SSL::SSLContext.new

data/ext/puppetlisten/puppetrun.rb

@@ -16,8 +16,7 @@ require 'puppet/sslcertificates/support'
 require 'socket'
 
 # load puppet configuration, needed to find ssl certificates
-Puppet[:config] = "/etc/puppet/puppet.conf"
-Puppet.parse_config
+Puppet.initialize_settings
 
 # establish the certificate
 ctx = OpenSSL::SSL::SSLContext.new

data/ext/rack/files/config.ru

@@ -2,7 +2,7 @@
 # SSL needs to be handled outside this, though.
 
 # if puppet is not in your RUBYLIB:
-# $:.unshift('/opt/puppet/lib')
+# $LOAD_PATH.unshift('/opt/puppet/lib')
 
 $0 = "master"
 
@@ -10,7 +10,25 @@ $0 = "master"
 # ARGV << "--debug"
 
 ARGV << "--rack"
-require 'puppet/application/master'
+
+# Rack applications typically don't start as root.  Set --confdir to prevent
+# reading configuration from ~/.puppet/puppet.conf
+ARGV << "--confdir" << "/etc/puppet"
+
+# NOTE: it's unfortunate that we have to use the "CommandLine" class
+#  here to launch the app, but it contains some initialization logic
+#  (such as triggering the parsing of the config file) that is very
+#  important.  We should do something less nasty here when we've
+#  gotten our API and settings initialization logic cleaned up.
+#
+# Also note that the "$0 = master" line up near the top here is
+#  the magic that allows the CommandLine class to know that it's
+#  supposed to be running master.
+#
+# --cprice 2012-05-22
+
+require 'puppet/util/command_line'
 # we're usually running inside a Rack::Builder.new {} block,
 # therefore we need to call run *here*.
-run Puppet::Application[:master].run
+run Puppet::Util::CommandLine.new.execute
+

data/ext/regexp_nodes/environment/development

@@ -0,0 +1,2 @@
+^dev-
+prod-canary

data/ext/regexp_nodes/parameters/service/sandbox

@@ -0,0 +1 @@
+^dev-

data/ext/regexp_nodes/regexp_nodes.rb

@@ -8,31 +8,44 @@
 # regexp_nodes.rb <host>
 #
 # = Description
-# This classifier implements filesystem autoloading: It looks through classes
-# and parameters subdirectories, looping through each file it finds there - the
-# contents are a regexp-per-line which, if they match the hostname passed us as
-# ARGV[0], will cause a class or parameter named the same thing as the file to
-# be set.
+# This classifier implements filesystem autoloading: It looks through classes,
+# parameters, and environment subdirectories, looping through each file it 
+# finds.  Each file's contents are a regexp-per-line which, if they match the 
+# hostname passed to the program as ARGV[0], sets a class, parameter value 
+# or environment named the same thing as the file itself. At the end, the
+# resultant data structure is returned back to the puppet master process as 
+# yaml.
+#
+# = Caveats
+# Since the files are read in directory order, multiple matches for a given
+# hostname in the parameters/ and environment/ subdirectories will return the
+# last-read value.  (Multiple classes/ matches don't cause a problem; the 
+# class is either incuded or it isn't)
+#
+# Unmatched hostnames in any of the environment/ files will cause 'production'
+# to be emitted; be aware of the complexity surrounding the interaction between
+# ENC and environments as discussed in https://projects.puppetlabs.com/issues/3910
 #
 # = Examples
-# In the distribution there are two subdirectories test_classes/ and
-# test_parameters, which are passed as parameters to MyExternalNode.new.
-# test_classes/database will set the 'database' class for any hostnames
-# matching %r{db\d{2}} (that is, 'db' followed by two digits) or with 'mysql'
-# anywhere in the hostname.  Similarly, hosts beginning with 'www' or 'web'
-# or the hostname 'leterel' (my workstation) will be assigned the 'webserver'
-# class.
+# Based on the example files in the classes/ and parameters/ subdirectories
+# in the distribution, classes/database will set the 'database' class for 
+# hosts matching %r{db\d{2}} (that is, 'db' followed by two digits) or with 
+# 'mysql' anywhere in the hostname.  Similarly, hosts beginning with 'www' or 
+# 'web' or the hostname 'leterel' (my workstation) will be assigned the 
+# 'webserver' class.
 #
-# Under test_parameters/ there is one subdirectory 'environment' which
-# sets the a parameter called 'environment' to the value 'prod' for production
-# hosts (whose hostnames always end with three numbers for us), 'qa' for
+# Under parameters/ there is one subdirectory 'service' which
+# sets the a parameter called 'service' to the value 'prod' for production
+# hosts (whose hostnames always end with a three-digit code), 'qa' for
 # anything that starts with 'qa-' 'qa2-' or 'qa3-', and 'sandbox' for any
-# development machines which are, naturally, named after Autechre songs.
+# development machines whose hostnames start with 'dev-'.
 #
+# In the environment/ subdirectory, any hosts matching '^dev-' and a single
+# production host which serves as 'canary in the coal mine' will be put into
+# the development environment 
 #
 # = Author
-# Eric Sorenson <esorenson@apple.com>
-
+# Eric Sorenson <eric@explosive.net>
 
 # we need yaml or there's not much point in going on
 require 'yaml'
@@ -40,18 +53,25 @@ require 'yaml'
 # Sets are like arrays but automatically de-duplicate elements
 require 'set'
 
-# set up some nice logging
-require 'logger'
-# XXX flip this for production vs local sandbox
-# $LOG = Logger.new("/var/lib/puppet/log/extnodes.log")
-# $LOG.level = Logger::FATAL
-$LOG = Logger.new($stderr)
-$LOG.level = Logger::DEBUG
+# set up some syslog logging
+require 'syslog'
+Syslog.open('extnodes', Syslog::LOG_PID | Syslog::LOG_NDELAY, Syslog::LOG_DAEMON)
+# change this to LOG_UPTO(Sysslog::LOG_DEBUG) if you want to see everything
+# but remember your syslog.conf needs to match this or messages will be filtered
+Syslog.mask = Syslog::LOG_UPTO(Syslog::LOG_INFO)
+
+# Helper method to log to syslog; we log at level debug if no level is specified
+# since those are the most frequent calls to this method
+def log(message,level=:debug)
+  Syslog.send(level,message)
+end
+
 
-# paths for files we use will be relative to this directory
-# XXX flip this for production vs local sandbox
-# WORKINGDIR = "/var/lib/puppet/bin"
-WORKINGDIR = Dir.pwd
+# set our workingdir to be the directory we're executed from, regardless
+# of parent's cwd, symlinks, etc. via handy Pathname.realpath method
+require 'pathname'
+p = Pathname.new(File.dirname(__FILE__))
+WORKINGDIR = "#{p.realpath}"
 
 # This class holds all the methods for creating and accessing the properties
 # of an external node. There are really only two public methods: initialize
@@ -59,7 +79,7 @@ WORKINGDIR = Dir.pwd
 
 class ExternalNode
   # Make these instance variables get/set-able with eponymous methods
-  attr_accessor :classes, :parameters, :hostname
+  attr_accessor :classes, :parameters, :environment, :hostname
 
   # initialize takes three arguments:
   # hostname:: usually passed in via ARGV[0] but it could be anything
@@ -67,26 +87,29 @@ class ExternalNode
   # classes
   # parameterdir:: directory under WORKINGDIR to look for directories to set
   # parameters
-  def initialize(hostname, classdir = 'classes/', parameterdir = 'parameters/')
+  def initialize(hostname, classdir = 'classes/', parameterdir = 'parameters/', environmentdir = 'environment/')
     # instance variables that contain the lists of classes and parameters
     @hostname
-    @classes = Set.new ["baseclass"]
-    @parameters = Hash.new("unknown")    # sets a default value of "unknown"
+    @classes = Set.new
+    @parameters = Hash.new("unknown")  # sets a default value of "unknown"
+    @environment = "production"
 
     self.parse_argv(hostname)
-    self.match_classes(WORKINGDIR + "/#{classdir}")
-    self.match_parameters(WORKINGDIR + "/#{parameterdir}")
+    self.match_classes("#{WORKINGDIR}/#{classdir}")
+    self.match_parameters("#{WORKINGDIR}/#{parameterdir}")
+    self.match_environment("#{WORKINGDIR}/#{environmentdir}")
   end
 
   # private method called by initialize which sanity-checks our hostname.
   # good candidate for overriding in a subclass if you need different checks
   def parse_argv(hostname)
-    if hostname =~ /^([-\w]+?)\.([-\w\.]+)/    # non-greedy up to the first . is hostname
+    if hostname =~ /^([-\w]+?)\.([-\w\.]+)/  # non-greedy up to the first . is hostname
       @hostname = $1
-    elsif hostname =~ /^([-\w]+)$/       # sometimes puppet's @name is just a name
+    elsif hostname =~ /^([-\w]+)$/     # sometimes puppet's @name is just a name
       @hostname = hostname
+      log("got shortname for [#{hostname}]")
     else
-      $LOG.fatal("didn't receive parsable hostname, got: [#{hostname}]")
+      log("didn't receive parsable hostname, got: [#{hostname}]",:err)
       exit(1)
     end
   end
@@ -100,7 +123,7 @@ class ExternalNode
     else
       parameters = self.parameters
     end
-    ({ 'classes' => classes, 'parameters' => parameters}).to_yaml
+    ({ 'classes' => classes, 'parameters' => parameters, 'environment' => environment}).to_yaml
   end
 
   # Private method that expects an absolute path to a file and a string to
@@ -112,27 +135,40 @@ class ExternalNode
 
     begin
       open(filepath).each { |l|
-        pattern = %r{#{l.chomp!}}
+        l.chomp!
+
+        next if l =~ /^$/
+        next if l =~ /^#/
+
+		if l =~ /^\s*(\S+)/
+          m = Regexp.last_match
+          log("found a non-comment line, transforming [#{l}] into [#{m[1]}]")
+          l.gsub!(l,m[1])
+        else
+          next l
+        end
+
+        pattern = %r{#{l}}
         patternlist <<  pattern
-        $LOG.debug("appending [#{pattern}] to patternlist for [#{filepath}]")
+        log("appending [#{pattern}] to patternlist for [#{filepath}]")
       }
     rescue Exception
-      $LOG.fatal("Problem reading #{filepath}: #{$ERROR_INFO}")
+      log("Problem reading #{filepath}: #{$!}",:err)
       exit(1)
     end
 
-    $LOG.debug("list of patterns for #{filepath}: #{patternlist}")
+    log("list of patterns for #{filepath}: #{patternlist}")
 
     if matchthis =~ Regexp.union(patternlist)
-      $LOG.debug("matched #{$~.to_s} in #{matchthis}, returning true")
+      log("matched #{$~.to_s} in #{matchthis}, returning true")
       return true
 
-    else    # hostname didn't match anything in patternlist
-      $LOG.debug("#{matchthis} unmatched, returning false")
+    else  # hostname didn't match anything in patternlist
+      log("#{matchthis} unmatched, returning false")
       return nil
     end
 
-  end
+  end # def
 
   # private method - takes a path to look for files, iterates through all
   # readable, regular files it finds, and matches this instance's @hostname
@@ -142,41 +178,60 @@ class ExternalNode
       filepath = "#{fullpath}/#{patternfile}"
       next unless File.file?(filepath) and
         File.readable?(filepath)
-      $LOG.debug("Attempting to match [#{@hostname}] in [#{filepath}]")
+        next if patternfile =~ /^\./
+      log("Attempting to match [#{@hostname}] in [#{filepath}]")
       if matched_in_patternfile?(filepath,@hostname)
         @classes << patternfile.to_s
-        $LOG.debug("Appended #{patternfile.to_s} to classes instance variable")
+        log("Appended #{patternfile.to_s} to classes instance variable")
       end
     end
   end
 
+  # match_environment is similar to match_classes but it overwrites 
+  # any previously set value (usually just the default, 'production')
+  # with a match
+  def match_environment(fullpath)
+    Dir.foreach(fullpath) do |patternfile|
+      filepath = "#{fullpath}/#{patternfile}"
+      next unless File.file?(filepath) and
+        File.readable?(filepath)
+        next if patternfile =~ /^\./
+      log("Attempting to match [#{@hostname}] in [#{filepath}]")
+      if matched_in_patternfile?(filepath,@hostname)
+        @environment = patternfile.to_s
+        log("Wrote #{patternfile.to_s} to environment instance variable")
+      end
+    end
+  end
+
+
   # Parameters are handled slightly differently; we make another level of
   # directories to get the parameter name, then use the names of the files
   # contained in there for the values of those parameters.
   #
-  # ex: cat /var/lib/puppet/bin/parameters/environment/production
+  # ex: cat ./parameters/service/production
   # ^prodweb
-  # would set parameters["environment"] = "production" for prodweb001
+  # would set parameters["service"] = "production" for prodweb001
   def match_parameters(fullpath)
     Dir.foreach(fullpath) do |parametername|
 
       filepath = "#{fullpath}/#{parametername}"
-      next if File.basename(filepath) =~ /^\./     # skip over dotfiles
+      next if File.basename(filepath) =~ /^\./   # skip over dotfiles
 
       next unless File.directory?(filepath) and
         File.readable?(filepath)        # skip over non-directories
 
-      $LOG.debug "Considering contents of #{filepath}"
+      log("Considering contents of #{filepath}")
 
       Dir.foreach("#{filepath}") do |patternfile|
         secondlevel = "#{filepath}/#{patternfile}"
-        $LOG.debug "Found parameters patternfile at #{secondlevel}"
+        log("Found parameters patternfile at #{secondlevel}")
         next unless File.file?(secondlevel) and
           File.readable?(secondlevel)
-        $LOG.debug("Attempting to match [#{@hostname}] in [#{secondlevel}]")
+        log("Attempting to match [#{@hostname}] in [#{secondlevel}]")
         if matched_in_patternfile?(secondlevel, @hostname)
           @parameters[ parametername.to_s ] = patternfile.to_s
-          $LOG.debug("Set @parameters[#{parametername.to_s}] = #{patternfile.to_s}")
+          log("Set @parameters[#{parametername.to_s}] = #{patternfile.to_s}")
         end
       end
     end
@@ -198,10 +253,11 @@ class MyExternalNode < ExternalNode
       match = Regexp.last_match
 
       hostclass = match[2]
-      $LOG.debug("matched hostclass #{hostclass}")
+      log("matched hostclass #{hostclass}")
       @parameters[ "hostclass" ] = hostclass
     else
-      $LOG.debug("hostclass couldn't figure out class from #{@hostname}")
+      log("couldn't figure out class from #{@hostname}",:warning)
+
     end
   end
 
@@ -210,6 +266,6 @@ end
 
 # Here we begin actual execution by calling methods defined above
 
-mynode = MyExternalNode.new(ARGV[0], classes = 'test_classes', parameters = 'test_parameters')
+mynode = MyExternalNode.new(ARGV[0])
 
 puts mynode.to_yaml

data/ext/upload_facts.rb

@@ -11,7 +11,6 @@ require 'puppet'
 require 'puppet/network/http_pool'
 
 class Puppet::Application::UploadFacts < Puppet::Application
-  should_parse_config
   run_mode :master
 
   option('--debug', '-d')

data/install.rb

@@ -54,7 +54,7 @@ rescue LoadError
   $haverdoc = false
 end
 
-PREREQS = %w{openssl facter xmlrpc/client xmlrpc/server cgi}
+PREREQS = %w{openssl facter cgi}
 MIN_FACTER_VERSION = 1.5
 
 InstallOptions = OpenStruct.new
@@ -84,7 +84,7 @@ def do_configs(configs, target, strip = 'conf/')
     if $haveftools
       File.install(cf, ocf, 0644, true)
     else
-      FileUtils.install(cf, ocf, {:mode => 0644, :preserve => true, :verbose => true})
+      FileUtils.install(cf, ocf, {:mode => 0644, :verbose => true})
     end
   end
 
@@ -94,7 +94,7 @@ def do_configs(configs, target, strip = 'conf/')
     if $haveftools
       File.install(src_dll, dst_dll, 0644, true)
     else
-      FileUtils.install(src_dll, dst_dll, {:mode => 0644, :preserve => true, :verbose => true})
+      FileUtils.install(src_dll, dst_dll, {:mode => 0644, :verbose => true})
     end
 
     require 'win32/registry'
@@ -121,7 +121,7 @@ end
 
 def do_libs(libs, strip = 'lib/')
   libs.each do |lf|
-    olf = File.join(InstallOptions.site_dir, lf.sub(/^#{strip}/, ''))
+    olf = File.join(InstallOptions.site_dir, lf.gsub(/#{strip}/, ''))
     op = File.dirname(olf)
     if $haveftools
       File.makedirs(op, true)
@@ -130,7 +130,7 @@ def do_libs(libs, strip = 'lib/')
     else
       FileUtils.makedirs(op, {:mode => 0755, :verbose => true})
       FileUtils.chmod(0755, op)
-      FileUtils.install(lf, olf, {:mode => 0644, :preserve => true, :verbose => true})
+      FileUtils.install(lf, olf, {:mode => 0644, :verbose => true})
     end
   end
 end
@@ -146,7 +146,7 @@ def do_man(man, strip = 'man/')
     else
       FileUtils.makedirs(om, {:mode => 0755, :verbose => true})
       FileUtils.chmod(0755, om)
-      FileUtils.install(mf, omf, {:mode => 0644, :preserve => true, :verbose => true})
+      FileUtils.install(mf, omf, {:mode => 0644, :verbose => true})
     end
     gzip = %x{which gzip}
     gzip.chomp!
@@ -420,12 +420,12 @@ def install_binfile(from, op_file, target)
     installed_wrapper = false
 
     if File.exists?("#{from}.bat")
-      FileUtils.install("#{from}.bat", File.join(target, "#{op_file}.bat"), :mode => 0755, :preserve => true, :verbose => true)
+      FileUtils.install("#{from}.bat", File.join(target, "#{op_file}.bat"), :mode => 0755, :verbose => true)
       installed_wrapper = true
     end
 
     if File.exists?("#{from}.cmd")
-      FileUtils.install("#{from}.cmd", File.join(target, "#{op_file}.cmd"), :mode => 0755, :preserve => true, :verbose => true)
+      FileUtils.install("#{from}.cmd", File.join(target, "#{op_file}.cmd"), :mode => 0755, :verbose => true)
       installed_wrapper = true
     end
 
@@ -439,13 +439,13 @@ set RUBY_BIN=%RUBY_BIN:\\=/%
 "%RUBY_BIN%ruby.exe" -x "%RUBY_BIN%puppet" %*
 EOS
       File.open(tmp_file2.path, "w") { |cw| cw.puts cwv }
-      FileUtils.install(tmp_file2.path, File.join(target, "#{op_file}.bat"), :mode => 0755, :preserve => true, :verbose => true)
+      FileUtils.install(tmp_file2.path, File.join(target, "#{op_file}.bat"), :mode => 0755, :verbose => true)
 
       tmp_file2.unlink
       installed_wrapper = true
     end
   end
-  FileUtils.install(tmp_file.path, File.join(target, op_file), :mode => 0755, :preserve => true, :verbose => true)
+  FileUtils.install(tmp_file.path, File.join(target, op_file), :mode => 0755, :verbose => true)
   tmp_file.unlink
 end