puppet 3.8.7 → 4.0.0.rc1

data/ext/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/master.pid
+pidfile=/var/run/puppetlabs/master.pid
 
 # Source function library.
 . /etc/rc.d/init.d/functions

data/ext/regexp_nodes/regexp_nodes.rb

@@ -152,7 +152,7 @@ class ExternalNode
         patternlist <<  pattern
         log("appending [#{pattern}] to patternlist for [#{filepath}]")
       }
-    rescue Exception
+    rescue StandardError
       log("Problem reading #{filepath}: #{$!}",:err)
       exit(1)
     end

data/ext/solaris/smf/svc-puppetd

@@ -12,7 +12,7 @@ exec_prefix=/opt/csw
 sysconfdir=/opt/csw/etc
 sbindir=/opt/csw/sbin
 
-pidfile=/var/lib/puppet/run/agent.pid
+pidfile=/var/run/puppetlabs/agent.pid
 
 case "$1" in
 start)

data/ext/solaris/smf/svc-puppetmasterd

@@ -8,7 +8,7 @@ exec_prefix=/opt/csw
 sysconfdir=/opt/csw/etc
 sbindir=/opt/csw/sbin
 
-pidfile=/var/lib/puppet/run/master.pid
+pidfile=/var/run/puppetlabs/master.pid
 
 case "$1" in
 start)

data/ext/suse/client.init

@@ -34,7 +34,7 @@
 [ -f /etc/rc.status ] && . /etc/rc.status
 [ -f /etc/sysconfig/puppet ] && . /etc/sysconfig/puppet
 lockfile=${LOCKFILE-/var/lock/subsys/puppet}
-pidfile=${PIDFILE-/var/run/puppet/agent.pid}
+pidfile=${PIDFILE-/var/run/puppetlabs/agent.pid}
 puppetd=${PUPPETD-/usr/bin/puppet}
 RETVAL=0
 

data/ext/suse/server.init

@@ -31,7 +31,7 @@
 #      rc_exit          exit appropriate to overall rc status
 
 lockfile=/var/lock/subsys/puppetmaster
-pidfile=/var/run/puppet/master.pid
+pidfile=/var/run/puppetlabs/master.pid
 
 # Source function library.
 [ -f /etc/rc.status ] && . /etc/rc.status

data/ext/systemd/puppet.service

@@ -6,9 +6,7 @@ After=basic.target network.target puppetmaster.service
 [Service]
 EnvironmentFile=-/etc/sysconfig/puppetagent
 EnvironmentFile=-/etc/sysconfig/puppet
-ExecStart=/usr/bin/puppet agent $PUPPET_EXTRA_OPTS --no-daemonize
-ExecReload=/bin/kill -HUP $MAINPID
-KillMode=process
+ExecStart=/opt/puppetlabs/puppet/bin/puppet agent $PUPPET_EXTRA_OPTS --no-daemonize
 
 [Install]
 WantedBy=multi-user.target

data/ext/vim/syntax/puppet.vim

@@ -48,7 +48,7 @@ syn match   puppetParam         "\w\+\s*[=+]>\s*[a-z0-9]\+" contains=puppetParam
 syn match   puppetParamString   "[=+]>\s*\w\+" contains=puppetParamKeyword,puppetParamSpecial,puppetParamDigits contained
 syn keyword puppetParamKeyword  present absent purged latest installed running stopped mounted unmounted role configured file directory link contained
 syn keyword puppetParamSpecial  true false undef contained
-syn match   puppetParamDigits   "[0-9]\+"
+syn match   puppetParamDigits   "\<[0-9]\+"
 
 " match 'template' in 'content => template("...")'
 syn match   puppetParam         "\w\+\s*[=+]>\s*\w\+\s*(" contains=puppetFunction,puppetParamName

data/ext/windows/service/daemon.rb

@@ -15,7 +15,7 @@ class WindowsDaemon < Win32::Daemon
   @run_thread = nil
   @LOG_TO_FILE = false
   LOG_FILE =  File.expand_path(File.join(Dir::COMMON_APPDATA, 'PuppetLabs', 'puppet', 'var', 'log', 'windows.log'))
-  LEVELS = [:debug, :info, :notice, :err]
+  LEVELS = [:debug, :info, :notice, :warning, :err, :alert, :emerg, :crit]
   LEVELS.each do |level|
     define_method("log_#{level}") do |msg|
       log(msg, level)
@@ -60,6 +60,8 @@ class WindowsDaemon < Win32::Daemon
     end
     log_debug("Using '#{puppet}'")
 
+    cmdline_debug = argsv.index('--debug') ? :debug : nil
+    @loglevel = parse_log_level(puppet, cmdline_debug)
     log_notice('Service started')
 
     service = self
@@ -127,7 +129,7 @@ class WindowsDaemon < Win32::Daemon
       case level
         when :debug, :info, :notice
           report_windows_event(EVENTLOG_INFORMATION_TYPE,0x01,msg.to_s)
-        when :err
+        when :err, :alert, :emerg, :crit
           report_windows_event(EVENTLOG_ERROR_TYPE,0x03,msg.to_s)
         else
           report_windows_event(EVENTLOG_WARNING_TYPE,0x02,msg.to_s)
@@ -168,6 +170,21 @@ class WindowsDaemon < Win32::Daemon
 
     runinterval
   end
+
+  def parse_log_level(puppet_path,cmdline_debug)
+    begin
+      loglevel = %x{ "#{puppet_path}" agent --configprint log_level}.chomp
+      unless loglevel
+        loglevel = :notice
+        log_err("Failed to determine loglevel, defaulting to #{loglevel}")
+      end
+    rescue Exception => e
+      log_exception(e)
+      loglevel = :notice
+    end
+
+    LEVELS.index(cmdline_debug ? cmdline_debug : loglevel.to_sym)
+  end
 end
 
 if __FILE__ == $0

data/install.rb

@@ -166,7 +166,7 @@ end
 # Prepare the file installation.
 #
 def prepare_installation
-  $operatingsystem = Facter["operatingsystem"].value
+  $operatingsystem = Facter.value :operatingsystem
 
   InstallOptions.configs = true
 
@@ -199,9 +199,21 @@ def prepare_installation
     opts.on('--destdir[=OPTIONAL]', 'Installation prefix for all targets', 'Default essentially /') do |destdir|
       InstallOptions.destdir = destdir
     end
-    opts.on('--configdir[=OPTIONAL]', 'Installation directory for config files', 'Default /etc/puppet') do |configdir|
+    opts.on('--configdir[=OPTIONAL]', 'Installation directory for config files', 'Default /etc/puppetlabs/puppet') do |configdir|
       InstallOptions.configdir = configdir
     end
+    opts.on('--codedir[=OPTIONAL]', 'Installation directory for code files', 'Default /etc/puppetlabs/code') do |codedir|
+      InstallOptions.codedir = codedir
+    end
+    opts.on('--vardir[=OPTIONAL]', 'Installation directory for var files', 'Default /opt/puppetlabs/puppet/cache') do |vardir|
+      InstallOptions.vardir = vardir
+    end
+    opts.on('--rundir[=OPTIONAL]', 'Installation directory for state files', 'Default /var/run/puppetlabs') do |rundir|
+      InstallOptions.rundir = rundir
+    end
+    opts.on('--logdir[=OPTIONAL]', 'Installation directory for log files', 'Default /var/log/puppetlabs') do |logdir|
+      InstallOptions.logdir = logdir
+    end
     opts.on('--bindir[=OPTIONAL]', 'Installation directory for binaries', 'overrides RbConfig::CONFIG["bindir"]') do |bindir|
       InstallOptions.bindir = bindir
     end
@@ -255,7 +267,39 @@ def prepare_installation
     end
     configdir = File.join(Dir::COMMON_APPDATA, "PuppetLabs", "puppet", "etc")
   else
-    configdir = "/etc/puppet"
+    configdir = "/etc/puppetlabs/puppet"
+  end
+
+  if not InstallOptions.codedir.nil?
+    codedir = InstallOptions.codedir
+  elsif $operatingsystem == "windows"
+    codedir = File.join(Dir::COMMON_APPDATA, "PuppetLabs", "code")
+  else
+    codedir = "/etc/puppetlabs/code"
+  end
+
+  if not InstallOptions.vardir.nil?
+    vardir = InstallOptions.vardir
+  elsif $operatingsystem == "windows"
+    vardir = File.join(Dir::COMMON_APPDATA, "PuppetLabs", "puppet", "cache")
+  else
+    vardir = "/opt/puppetlabs/puppet/cache"
+  end
+
+  if not InstallOptions.rundir.nil?
+    rundir = InstallOptions.rundir
+  elsif $operatingsystem == "windows"
+    rundir = File.join(Dir::COMMON_APPDATA, "PuppetLabs", "puppet", "var", "run")
+  else
+    rundir = "/var/run/puppetlabs"
+  end
+
+  if not InstallOptions.logdir.nil?
+    logdir = InstallOptions.logdir
+  elsif $operatingsystem == "windows"
+    logdir = File.join(Dir::COMMON_APPDATA, "PuppetLabs", "puppet", "var", "log")
+  else
+    logdir = "/var/log/puppetlabs"
   end
 
   if not InstallOptions.bindir.nil?
@@ -296,20 +340,32 @@ def prepare_installation
   end
 
   configdir = join(destdir, configdir)
+  codedir = join(destdir, codedir)
+  vardir = join(destdir, vardir)
+  rundir = join(destdir, rundir)
+  logdir = join(destdir, logdir)
   bindir = join(destdir, bindir)
   mandir = join(destdir, mandir)
   sitelibdir = join(destdir, sitelibdir)
 
   FileUtils.makedirs(configdir) if InstallOptions.configs
+  FileUtils.makedirs(codedir)
   FileUtils.makedirs(bindir)
   FileUtils.makedirs(mandir)
   FileUtils.makedirs(sitelibdir)
+  FileUtils.makedirs(vardir)
+  FileUtils.makedirs(rundir)
+  FileUtils.makedirs(logdir)
 
   InstallOptions.site_dir = sitelibdir
+  InstallOptions.codedir = codedir
   InstallOptions.config_dir = configdir
-  InstallOptions.bin_dir  = bindir
-  InstallOptions.lib_dir  = libdir
-  InstallOptions.man_dir  = mandir
+  InstallOptions.bin_dir = bindir
+  InstallOptions.lib_dir = libdir
+  InstallOptions.man_dir = mandir
+  InstallOptions.var_dir = vardir
+  InstallOptions.run_dir = rundir
+  InstallOptions.log_dir = logdir
 end
 
 ##
@@ -410,7 +466,7 @@ end
 # Change directory into the puppet root so we don't get the wrong files for install.
 FileUtils.cd File.dirname(__FILE__) do
   # Set these values to what you want installed.
-  configs = glob(%w{conf/auth.conf})
+  configs = glob(%w{conf/auth.conf conf/puppet.conf})
   bins  = glob(%w{bin/*})
   rdoc  = glob(%w{bin/* lib/**/*.rb README* }).reject { |e| e=~ /\.(bat|cmd)$/ }
   ri    = glob(%w{bin/*.rb lib/**/*.rb}).reject { |e| e=~ /\.(bat|cmd)$/ }

data/lib/hiera/puppet_function.rb

@@ -12,15 +12,10 @@ class Hiera::PuppetFunction < Puppet::Functions::InternalFunction
       param 'Tuple[String, Any, Any, 1, 3]', :args
     end
 
-    dispatch :hiera_no_default do
+    dispatch :hiera do
       scope_param
       param 'String',:key
-    end
-
-    dispatch :hiera_with_default do
-      scope_param
-      param 'String',:key
-      param 'Any',   :default
+      optional_param 'Any',   :default
       optional_param 'Any',   :override
     end
 
@@ -42,14 +37,8 @@ class Hiera::PuppetFunction < Puppet::Functions::InternalFunction
     hiera(scope, *args)
   end
 
-  def hiera_no_default(scope, key)
-    post_lookup(scope, key, lookup(scope, key, nil, nil))
-  end
-
-  def hiera_with_default(scope, key, default, override = nil)
-    undefined = (@@undefined_value ||= Object.new)
-    result = lookup(scope, key, undefined, override)
-    post_lookup(scope, key, result.equal?(undefined) ? default : result)
+  def hiera(scope, key, default = nil, override = nil)
+    post_lookup(key, lookup(scope, key, default, override))
   end
 
   def hiera_block1(scope, key, &default_block)
@@ -63,20 +52,20 @@ class Hiera::PuppetFunction < Puppet::Functions::InternalFunction
   def common(scope, key, override, default_block)
     undefined = (@@undefined_value ||= Object.new)
     result = lookup(scope, key, undefined, override)
-    post_lookup(scope, key, result.equal?(undefined) ? default_block.call(key) : result)
+    post_lookup(key, result.equal?(undefined) ? default_block.call(key) : result)
   end
 
   private :common
 
   def lookup(scope, key, default, override)
-    HieraPuppet.lookup(key, default, scope, override, merge_type)
+    HieraPuppet.lookup(key, default,scope, override, merge_type)
   end
 
   def merge_type
     :priority
   end
 
-  def post_lookup(scope, key, result)
+  def post_lookup(key, result)
     result
   end
 end

data/lib/hiera/scope.rb

@@ -1,6 +1,7 @@
 class Hiera
   class Scope
     CALLING_CLASS = "calling_class"
+    CALLING_CLASS_PATH = "calling_class_path"
     CALLING_MODULE = "calling_module"
     MODULE_NAME = "module_name"
 
@@ -13,6 +14,8 @@ class Hiera
     def [](key)
       if key == CALLING_CLASS
         ans = find_hostclass(@real)
+      elsif key == CALLING_CLASS_PATH
+        ans = find_hostclass(@real).gsub(/::/, '/')
       elsif key == CALLING_MODULE
         ans = @real.lookupvar(MODULE_NAME)
       else
@@ -27,7 +30,7 @@ class Hiera
     end
 
     def include?(key)
-      if key == CALLING_CLASS or key == CALLING_MODULE
+      if [CALLING_CLASS, CALLING_CLASS_PATH, CALLING_MODULE].include? key
         true
       else
         @real.lookupvar(key) != ""

data/lib/puppet.rb

@@ -1,5 +1,9 @@
 require 'puppet/version'
 
+if RUBY_VERSION < "1.9.3"
+  raise LoadError, "Puppet #{Puppet.version} requires ruby 1.9.3 or greater."
+end
+
 # see the bottom of the file for further inclusions
 # Also see the new Vendor support - towards the end
 #
@@ -34,7 +38,6 @@ module Puppet
   class << self
     include Puppet::Util
     attr_reader :features
-    attr_writer :name
   end
 
   # the hash that determines how our system behaves
@@ -61,13 +64,12 @@ module Puppet
     end
   end
 
-  # The services running in this process.
-  @services ||= []
-
   require 'puppet/util/logging'
-
   extend Puppet::Util::Logging
 
+  # Setup facter's logging
+  Puppet::Util::Logging.setup_facter_logging!
+
   # The feature collection
   @features = Puppet::Util::Feature.new('puppet/feature')
 
@@ -82,8 +84,6 @@ module Puppet
   # setting access and stuff
   def self.[]=(param,value)
     @@settings[param] = value
-    # Ensure that all environment caches are cleared if we're changing the parser
-    lookup(:environments).clear_all if param == :parser
   end
 
   def self.clear
@@ -115,20 +115,6 @@ module Puppet
   # Load all of the settings.
   require 'puppet/defaults'
 
-  def self.genmanifest
-    if Puppet[:genmanifest]
-      puts Puppet.settings.to_manifest
-      exit(0)
-    end
-  end
-
-  # Parse the config file for this process.
-  # @deprecated Use {initialize_settings}
-  def self.parse_config()
-    Puppet.deprecation_warning("Puppet.parse_config is deprecated; please use Faces API (which will handle settings and state management for you), or (less desirable) call Puppet.initialize_settings")
-    Puppet.initialize_settings
-  end
-
   # Initialize puppet's settings. This is intended only for use by external tools that are not
   #  built off of the Faces API or the Puppet::Util::Application class. It may also be used
   #  to initialize state so that a Face may be used programatically, rather than as a stand-alone
@@ -141,14 +127,6 @@ module Puppet
     do_initialize_settings_for_run_mode(:user, args)
   end
 
-  # Initialize puppet's settings for a specified run_mode.
-  #
-  # @deprecated Use {initialize_settings}
-  def self.initialize_settings_for_run_mode(run_mode)
-    Puppet.deprecation_warning("initialize_settings_for_run_mode may be removed in a future release, as may run_mode itself")
-    do_initialize_settings_for_run_mode(run_mode, [])
-  end
-
   # private helper method to provide the implementation details of initializing for a run mode,
   #  but allowing us to control where the deprecation warning is issued
   def self.do_initialize_settings_for_run_mode(run_mode, args)
@@ -157,7 +135,6 @@ module Puppet
     Puppet.settings.initialize_app_defaults(Puppet::Settings.app_defaults_for_run_mode(run_mode))
     Puppet.push_context(Puppet.base_context(Puppet.settings), "Initial context after settings initialization")
     Puppet::Parser::Functions.reset
-    Puppet::Util::Log.level = Puppet[:log_level]
   end
   private_class_method :do_initialize_settings_for_run_mode
 
@@ -165,6 +142,7 @@ module Puppet
   # code was deprecated in 2008, but this is still in heavy use.  I suppose
   # this can count as a soft deprecation for the next dev. --daniel 2011-04-12
   def self.newtype(name, options = {}, &block)
+    Puppet.deprecation_warning("Puppet.newtype is deprecated and will be removed in a future release. Use Puppet::Type.newtype instead.")
     Puppet::Type.newtype(name, options, &block)
   end
 
@@ -173,27 +151,26 @@ module Puppet
   require "puppet/vendor"
   Puppet::Vendor.load_vendored
 
-  # Set default for YAML.load to unsafe so we don't affect programs
-  # requiring puppet -- in puppet we will call safe explicitly
-  SafeYAML::OPTIONS[:default_mode] = :unsafe
-
   # The bindings used for initialization of puppet
+  #
+  # @param settings [Puppet::Settings,Hash<Symbol,String>] either a Puppet::Settings instance
+  #   or a Hash of settings key/value pairs.
   # @api private
   def self.base_context(settings)
-    environments = settings[:environmentpath]
-    modulepath = Puppet::Node::Environment.split_path(settings[:basemodulepath])
+    environmentpath = settings[:environmentpath]
+    basemodulepath = Puppet::Node::Environment.split_path(settings[:basemodulepath])
 
-    if environments.empty?
-      loaders = [Puppet::Environments::Legacy.new]
+    if environmentpath.nil? || environmentpath.empty?
+      raise(Puppet::Error, "The environmentpath setting cannot be empty or nil.")
     else
-      loaders = Puppet::Environments::Directories.from_path(environments, modulepath)
+      loaders = Puppet::Environments::Directories.from_path(environmentpath, basemodulepath)
       # in case the configured environment (used for the default sometimes)
       # doesn't exist
       default_environment = Puppet[:environment].to_sym
       if default_environment == :production
         loaders << Puppet::Environments::StaticPrivate.new(
-          Puppet::Node::Environment.create(Puppet[:environment].to_sym,
-                                           [],
+          Puppet::Node::Environment.create(default_environment,
+                                           basemodulepath,
                                            Puppet::Node::Environment::NO_MANIFEST))
       end
     end
@@ -244,8 +221,6 @@ module Puppet
   # @api private
   def self.override(bindings, description = "", &block)
     @context.override(bindings, description, &block)
-  ensure
-    lookup(:root_environment).instance_variable_set(:@future_parser, nil)
   end
 
   # @api private
@@ -262,14 +237,6 @@ module Puppet
 
   # The single instance used for normal operation
   @context = Puppet::Context.new(bootstrap_context)
-
-  # Is the future parser in effect for the given environment, or in :current_environment if no
-  # environment is given.
-  #
-  def self.future_parser?(in_environment = nil)
-    env = in_environment || Puppet.lookup(:current_environment) { return Puppet[:parser] == 'future' }
-    env.future_parser?
-  end
 end
 
 # This feels weird to me; I would really like for us to get to a state where there is never a "require" statement
@@ -287,3 +254,4 @@ require 'puppet/data_binding'
 require 'puppet/util/storage'
 require 'puppet/status'
 require 'puppet/file_bucket/file'
+require 'puppet/plugins'