puppet 4.0.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2614a19183e40a97b6d09455aca68f9dec13beba
-  data.tar.gz: f292f207f71e578d5ccd44a90f647f3dff2d7426
+  metadata.gz: 5697f12fa3914a8f6711cfafe0b62a799f2332d1
+  data.tar.gz: f2e3e77a13e52a34c5926d5df601a3de203fe87e
 SHA512:
-  metadata.gz: 278d422f4353ca36a117fed46f75979baf1e06ab2284eac44454170112b9326042d136e1e2a5502c66fafe37cd58b2aac357d47a3773d1682ab217cc0bc9618a
-  data.tar.gz: 391ec1deb1fd7d9566b34ae69f1aa70ebee7d4a3ca514a1ad73cc49a033420b1fea32542446a2c2ac802bafd40fc7aee721cdeea82836d77fa0d471e76974d25
+  metadata.gz: 3782d9be1c7e84fd7bb0b5f247c16cc0c25fb8302be4a99c095f493233f94d7a8f7f2d747e5c3c0c60218f3dd0ad6d608d019bfdf82147122353528597c2018e
+  data.tar.gz: d53ca51aadada05f519ec4748fdc95a611ff32367bd9e9da15560449a38ba27c2989fd78d25dc552053df9ea736b2eaf9ae01b94ad958075d4bf9cc1eca05a8f

data/ext/build_defaults.yaml

@@ -1,47 +1,20 @@
 ---
 packaging_url: 'git://github.com/puppetlabs/packaging.git --branch=master'
 packaging_repo: 'packaging'
-default_cow: 'base-squeeze-i386.cow'
-cows: 'base-lucid-i386.cow base-precise-i386.cow base-squeeze-i386.cow base-stable-i386.cow base-testing-i386.cow base-trusty-i386.cow base-wheezy-i386.cow'
-pbuild_conf: '/etc/pbuilderrc'
 packager: 'puppetlabs'
-gpg_name: 'info@puppetlabs.com'
 gpg_key: '4BD6EC30'
+
+# These are the build targets used by the packaging repo. Uncomment to allow use.
+#final_mocks: 'pl-el-5-i386 pl-el-6-i386 pl-el-7-x86_64'
+#cows: 'base-lucid-i386.cow base-precise-i386.cow base-squeeze-i386.cow base-trusty-i386.cow base-wheezy-i386.cow'
+pbuild_conf: '/etc/pbuilderrc'
+
+build_gem: TRUE
+build_dmg: FALSE
 sign_tar: FALSE
-# a space separated list of mock configs
-final_mocks: 'pl-el-5-i386 pl-el-6-i386 pl-el-7-x86_64 pl-fedora-19-i386 pl-fedora-20-i386'
 yum_host: 'yum.puppetlabs.com'
 yum_repo_path: '/opt/repository/yum/'
-build_gem: TRUE
-build_dmg: TRUE
-msi_name: 'puppet-agent'
-build_msi:
-  puppet_for_the_win:
-    ref: '52e81967253924428bb0b1e7e1a11e8678d68378'
-    repo: 'git://github.com/puppetlabs/puppet_for_the_win.git'
-  facter:
-    ref: 'refs/tags/2.4.0'
-    repo: 'git://github.com/puppetlabs/facter.git'
-  cfacter:
-    archive:
-      x86: 'cfacter-0.3.0-x86.zip'
-      x64: 'cfacter-0.3.0-x64.zip'
-    path: 'http://builds.puppetlabs.lan/cfacter/0.3.0/artifacts/windows'
-  hiera:
-    ref: 'refs/tags/2.0.0'
-    repo: 'git://github.com/puppetlabs/hiera.git'
-  mcollective:
-    ref: 'refs/tags/2.7.0'
-    repo: 'git://github.com/puppetlabs/marionette-collective.git'
-  sys:
-    ref:
-      x86: '8db9d84da9950760144b5dfcd807213eecee4842'
-      x64: '12030f11e9bb2f085c68108bff34be6956b25df9'
-    repo: 'git://github.com/puppetlabs/puppet-win32-ruby.git'
 apt_host: 'apt.puppetlabs.com'
 apt_repo_url: 'http://apt.puppetlabs.com'
 apt_repo_path: '/opt/repository/incoming'
-ips_repo: '/var/pkgrepo'
-ips_store: '/opt/repository'
-ips_host: 'solaris-11-ips-repo.acctest.dc1.puppetlabs.net'
 tar_host: 'downloads.puppetlabs.com'

data/ext/debian/puppet.default

@@ -1,9 +1,4 @@
 # Defaults for puppet - sourced by /etc/init.d/puppet
 
-# Enable puppet agent service?
-# Setting this to "yes" allows the puppet agent service to run.
-# Setting this to "no" keeps the puppet agent service from running.
-START=no
-
 # Startup options
 DAEMON_OPTS=""

data/ext/debian/puppet.init

@@ -22,26 +22,12 @@ test -x $DAEMON || exit 0
 
 . /lib/lsb/init-functions
 
-is_true() {
-    if [ "x$1" = "xtrue" -o "x$1" = "xyes" -o "x$1" = "x0" ] ; then
-       return 0
-    else
-        return 1
-    fi
-}
-
 reload_puppet_agent() {
     start-stop-daemon --stop --quiet --signal HUP --pidfile $PIDFILE --name $PROCNAME
 }
 
 start_puppet_agent() {
-    if is_true "$START" ; then
-        start-stop-daemon --start --quiet --pidfile $PIDFILE \
-          --startas $DAEMON -- $NAME $DAEMON_OPTS
-    else
-        echo ""
-        echo "puppet not configured to start, please edit /etc/default/puppet to enable"
-    fi
+    start-stop-daemon --start --quiet --pidfile $PIDFILE --startas $DAEMON -- $NAME $DAEMON_OPTS
 }
 
 stop_puppet_agent() {

data/lib/hiera/puppet_function.rb

@@ -12,10 +12,15 @@ class Hiera::PuppetFunction < Puppet::Functions::InternalFunction
       param 'Tuple[String, Any, Any, 1, 3]', :args
     end
 
-    dispatch :hiera do
+    dispatch :hiera_no_default do
       scope_param
       param 'String',:key
-      optional_param 'Any',   :default
+    end
+
+    dispatch :hiera_with_default do
+      scope_param
+      param 'String',:key
+      param 'Any',   :default
       optional_param 'Any',   :override
     end
 
@@ -37,8 +42,14 @@ class Hiera::PuppetFunction < Puppet::Functions::InternalFunction
     hiera(scope, *args)
   end
 
-  def hiera(scope, key, default = nil, override = nil)
-    post_lookup(key, lookup(scope, key, default, override))
+  def hiera_no_default(scope, key)
+    post_lookup(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(key, result.equal?(undefined) ? default : result)
   end
 
   def hiera_block1(scope, key, &default_block)

data/lib/puppet/application/agent.rb

@@ -228,6 +228,11 @@ generated by running puppet agent with '--genconfig'.
   file. If debugging or verbosity is enabled, this defaults to 'console'.
   Otherwise, it defaults to 'syslog' on POSIX systems and 'eventlog' on Windows.
 
+  A path ending with '.json' will receive structured output in JSON format. The
+  log file will not have an ending ']' automatically written to it due to the
+  appending nature of logging. It must be appended manually to make the content
+  valid JSON.
+
 * --masterport:
   The port on which to contact the puppet master.
   (This is a Puppet setting, and can go in puppet.conf.)

data/lib/puppet/application/apply.rb

@@ -99,6 +99,11 @@ configuration options can also be generated by running puppet with
   service), 'eventlog' (the Windows Event Log), 'console', or the path to a log
   file. Defaults to 'console'.
 
+  A path ending with '.json' will receive structured output in JSON format. The
+  log file will not have an ending ']' automatically written to it due to the
+  appending nature of logging. It must be appended manually to make the content
+  valid JSON.
+
 * --noop:
   Use 'noop' mode where Puppet runs in a no-op or dry-run mode. This
   is useful for seeing what changes Puppet will make without actually
@@ -199,6 +204,11 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
       # Merge in the facts.
       node.merge(facts.values) if facts
 
+      # Add server facts so $server_facts[environment] exists when doing a puppet apply
+      if Puppet[:trusted_server_facts]
+        node.add_server_facts({})
+      end
+
       # Allow users to load the classes that puppet agent creates.
       if options[:loadclasses]
         file = Puppet[:classfile]
@@ -212,9 +222,20 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
       end
 
       begin
-        # Compile our catalog
+        # Compile the catalog
         starttime = Time.now
-        catalog = Puppet::Resource::Catalog.indirection.find(node.name, :use_node => node)
+
+        # When compiling, the compiler traps and logs certain errors
+        # Those that do not lead to an immediate exit are caught by the general
+        # rule and gets logged.
+        #
+        catalog =
+        begin
+          Puppet::Resource::Catalog.indirection.find(node.name, :use_node => node)
+        rescue Puppet::ParseErrorWithIssue, Puppet::Error
+          # already logged and handled by the compiler for these two cases
+          exit(1)
+        end
 
         # Translate it to a RAL catalog
         catalog = catalog.to_ral

data/lib/puppet/application/device.rb

@@ -124,9 +124,14 @@ parameter, so you can specify '--server <servername>' as an argument.
   Print this help message
 
 * --logdest:
-  Where to send messages.  Choose between syslog, the console, and a log file.
-  Defaults to sending messages to syslog, or the console if debugging or
-  verbosity is enabled.
+  Where to send log messages. Choose between 'syslog' (the POSIX syslog
+  service), 'console', or the path to a log file. If debugging or verbosity is
+  enabled, this defaults to 'console'. Otherwise, it defaults to 'syslog'.
+
+  A path ending with '.json' will receive structured output in JSON format. The
+  log file will not have an ending ']' automatically written to it due to the
+  appending nature of logging. It must be appended manually to make the content
+  valid JSON.
 
 * --verbose:
   Turn on verbose reporting.

data/lib/puppet/application/master.rb

@@ -86,6 +86,11 @@ generated by running puppet master with '--genconfig'.
   service), 'console', or the path to a log file. If debugging or verbosity is
   enabled, this defaults to 'console'. Otherwise, it defaults to 'syslog'.
 
+  A path ending with '.json' will receive structured output in JSON format. The
+  log file will not have an ending ']' automatically written to it due to the
+  appending nature of logging. It must be appended manually to make the content
+  valid JSON.
+
 * --masterport:
   The port on which to listen for traffic.
   (This is a Puppet setting, and can go in puppet.conf.)
@@ -185,17 +190,23 @@ Copyright (c) 2012 Puppet Labs, LLC Licensed under the Apache 2.0 License
     Puppet::SSL::Host.ca_location = :only if Puppet::SSL::CertificateAuthority.ca?
 
     if Puppet.features.root?
-      begin
-        Puppet::Util.chuser
-      rescue => detail
-        Puppet.log_exception(detail, "Could not change user to #{Puppet[:user]}: #{detail}")
-        exit(39)
+      if Puppet::Type.type(:user).new(:name => Puppet[:user]).exists?
+        begin
+          Puppet::Util.chuser
+        rescue => detail
+          Puppet.log_exception(detail, "Could not change user to #{Puppet[:user]}: #{detail}")
+          exit(39)
+        end
+      else
+        raise Puppet::Error.new("Could not change user to #{Puppet[:user]}. User does not exist and is required to continue.")
       end
     end
 
     if options[:rack]
+      Puppet.deprecation_warning("The Rack Puppet master server is deprecated and will be removed in a future release. Please use Puppet Server instead. See http://links.puppetlabs.com/deprecate-rack-webrick-servers for more information.")
       start_rack_master
     else
+      Puppet.deprecation_warning("The WEBrick Puppet master server is deprecated and will be removed in a future release. Please use Puppet Server instead. See http://links.puppetlabs.com/deprecate-rack-webrick-servers for more information.")
       start_webrick_master
     end
   end

data/lib/puppet/configurer.rb

@@ -114,13 +114,15 @@ class Puppet::Configurer
   # the options, then apply that one, otherwise retrieve it.
   def apply_catalog(catalog, options)
     report = options[:report]
-    report.configuration_version = catalog.version
+    begin
+      report.configuration_version = catalog.version
 
-    benchmark(:notice, "Applied catalog") do
-      catalog.apply(options)
+      benchmark(:notice, "Applied catalog") do
+        catalog.apply(options)
+      end
+    ensure
+      report.finalize_report
     end
-
-    report.finalize_report
     report
   end
 

data/lib/puppet/defaults.rb

@@ -505,6 +505,24 @@ module Puppet
         :desc     => "Freezes the 'main' class, disallowing any code to be added to it.  This
           essentially means that you can't have any code outside of a node,
           class, or definition other than in the site manifest.",
+    },
+    :trusted_server_facts => {
+      :default => false,
+      :type    => :boolean,
+      :desc    => "When enabled, Puppet creates a protected top-scope variable called $server_facts.
+        This variable name can't be re-used in any local scope, and can't be overridden
+        by agent-provided facts.
+
+        The $server_facts variable is a hash, containing server-provided information
+        like the current node's environment and the version of Puppet running on the server.",
+    },
+    :preview_outputdir => {
+      :default => '$vardir/preview',
+      :type     => :directory,
+      :mode     => "0750",
+      :owner    => "service",
+      :group    => "service",
+      :desc    => "The directory where catalog previews per node are generated."
     }
   )
   Puppet.define_settings(:module_tool,

data/lib/puppet/environments.rb

@@ -190,7 +190,7 @@ module Puppet::Environments
 
     private
 
-    def create_environment(name, setting_values = nil)
+    def create_environment(name)
       env_symbol = name.intern
       setting_values = Puppet.settings.values(env_symbol, Puppet.settings.preferred_run_mode)
       Puppet::Node::Environment.create(

data/lib/puppet/error.rb

@@ -54,8 +54,34 @@ module Puppet
     include ExternalFileError
   end
 
+  # Contains an issue code and can be annotated with an environment and a node
+  class ParseErrorWithIssue < Puppet::ParseError
+    attr_reader :issue_code, :basic_message
+    attr_accessor :environment, :node
+
+    # @param message [String] The error message
+    # @param file [String] The path to the file where the error was found
+    # @param line [Integer] The line in the file
+    # @param pos [Integer] The position on the line
+    # @param original [Exception] Original exception
+    # @param issue_code [Symbol] The issue code
+    #
+    def initialize(message, file=nil, line=nil, pos=nil, original=nil, issue_code= nil)
+      super(message, file, line, pos, original)
+      @issue_code = issue_code
+      @basic_message = message
+    end
+
+    def to_s
+      msg = super
+      msg = "Could not parse for environment #{environment}: #{msg}" if environment
+      msg = "#{msg} on node #{node}" if node
+      msg
+    end
+  end
+
   # An error that already contains location information in the message text
-  class PreformattedError < Puppet::ParseError
+  class PreformattedError < Puppet::ParseErrorWithIssue
   end
 
   # An error class for when I don't know what happened.  Automatically

data/lib/puppet/file_serving/metadata.rb

@@ -12,7 +12,7 @@ class Puppet::FileServing::Metadata < Puppet::FileServing::Base
   extend Puppet::Indirector
   indirects :file_metadata, :terminus_class => :selector
 
-  attr_reader :path, :owner, :group, :mode, :checksum_type, :checksum, :ftype, :destination
+  attr_reader :path, :owner, :group, :mode, :checksum_type, :checksum, :ftype, :destination, :source_permissions
 
   PARAM_ORDER = [:mode, :ftype, :owner, :group]
 
@@ -22,10 +22,16 @@ class Puppet::FileServing::Metadata < Puppet::FileServing::Base
     @checksum_type = type
   end
 
+  def source_permissions=(source_permissions)
+    raise(ArgumentError, "Unsupported source_permission #{source_permissions}") unless [:use, :use_when_creating, :ignore].include?(source_permissions.intern)
+
+    @source_permissions = source_permissions.intern
+  end
+
   class MetaStat
     extend Forwardable
 
-    def initialize(stat, source_permissions = nil)
+    def initialize(stat, source_permissions)
       @stat = stat
       @source_permissions_ignore = (!source_permissions || source_permissions == :ignore)
     end
@@ -50,7 +56,7 @@ class Puppet::FileServing::Metadata < Puppet::FileServing::Base
       require 'puppet/util/windows/security'
     end
 
-    def initialize(stat, path, source_permissions = nil)
+    def initialize(stat, path, source_permissions)
       super(stat, source_permissions)
       @path = path
       raise(ArgumentError, "Unsupported Windows source permissions option #{source_permissions}") unless @source_permissions_ignore
@@ -66,13 +72,13 @@ class Puppet::FileServing::Metadata < Puppet::FileServing::Base
     end
   end
 
-  def collect_stat(path, source_permissions)
+  def collect_stat(path)
     stat = stat()
 
     if Puppet.features.microsoft_windows?
-      WindowsStat.new(stat, path, source_permissions)
+      WindowsStat.new(stat, path, @source_permissions)
     else
-      MetaStat.new(stat, source_permissions)
+      MetaStat.new(stat, @source_permissions)
     end
   end
 
@@ -82,7 +88,7 @@ class Puppet::FileServing::Metadata < Puppet::FileServing::Base
   def collect(source_permissions = nil)
     real_path = full_path
 
-    stat = collect_stat(real_path, source_permissions)
+    stat = collect_stat(real_path)
     @owner = stat.owner
     @group = stat.group
     @ftype = stat.ftype
@@ -130,7 +136,6 @@ class Puppet::FileServing::Metadata < Puppet::FileServing::Base
         },
         'type'         => ftype,
         'destination'  => destination,
-
       }
     )
   end

data/lib/puppet/file_serving/terminus_helper.rb

@@ -2,19 +2,18 @@ require 'puppet/file_serving'
 require 'puppet/file_serving/fileset'
 
 # Define some common methods for FileServing termini.
+
 module Puppet::FileServing::TerminusHelper
   # Create model instance for a file in a file server.
   def path2instance(request, path, options = {})
     result = model.new(path, :relative_path => options[:relative_path])
-    result.checksum_type = request.options[:checksum_type] if request.options[:checksum_type]
     result.links = request.options[:links] if request.options[:links]
 
-    # :ignore_source_permissions is here pending investigation in PUP-3906.
-    if options[:ignore_source_permissions]
-      result.collect
-    else
-      result.collect(request.options[:source_permissions])
-    end
+    result.checksum_type = request.options[:checksum_type] if request.options[:checksum_type]
+    result.source_permissions = request.options[:source_permissions] if request.options[:source_permissions]
+
+    result.collect
+
     result
   end
 
@@ -26,7 +25,7 @@ module Puppet::FileServing::TerminusHelper
     end
 
     Puppet::FileServing::Fileset.merge(*filesets).collect do |file, base_path|
-      path2instance(request, base_path, :ignore_source_permissions => true, :relative_path => file)
+      path2instance(request, base_path, :relative_path => file)
     end
   end
 end