puppet 4.0.0.rc1 → 4.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 2614a19183e40a97b6d09455aca68f9dec13beba
+  data.tar.gz: f292f207f71e578d5ccd44a90f647f3dff2d7426
+SHA512:
+  metadata.gz: 278d422f4353ca36a117fed46f75979baf1e06ab2284eac44454170112b9326042d136e1e2a5502c66fafe37cd58b2aac357d47a3773d1682ab217cc0bc9618a
+  data.tar.gz: 391ec1deb1fd7d9566b34ae69f1aa70ebee7d4a3ca514a1ad73cc49a033420b1fea32542446a2c2ac802bafd40fc7aee721cdeea82836d77fa0d471e76974d25

data/CONTRIBUTING.md

@@ -73,7 +73,7 @@ for advice.
 For changes of a trivial nature to comments and documentation, it is not
 always necessary to create a new ticket in Jira. In this case, it is
 appropriate to start the first line of a commit with '(doc)' instead of
-a ticket number. 
+a ticket number.
 
 ````
     (doc) Add documentation commit example to CONTRIBUTING
@@ -83,7 +83,7 @@ a ticket number.
     is left to assume how a commit of this nature may appear.
 
     The first line is a real life imperative statement with '(doc)' in
-    place of what would have been the ticket number in a 
+    place of what would have been the ticket number in a
     non-documentation related commit. The body describes the nature of
     the new documentation or comments added.
 ````
@@ -97,15 +97,20 @@ a ticket number.
   * Include a link to the pull request in the ticket.
 * The core team looks at Pull Requests on a regular basis in a weekly triage
   meeting that we hold in a public Google Hangout. The hangout is announced in
-  the weekly status updates that are sent to the puppet-dev list.
+  the weekly status updates that are sent to the puppet-dev list. Notes are
+  posted to the [Puppet Community community-triage
+  repo](https://github.com/puppet-community/community-triage/tree/master/core/notes)
+  and include a link to a YouTube recording of the hangout.
 * After feedback has been given we expect responses within two weeks. After two
-  weeks will may close the pull request if it isn't showing any activity.
+  weeks we may close the pull request if it isn't showing any activity.
 
 # Additional Resources
 
-* [More information on contributing](http://links.puppetlabs.com/contribute-to-puppet)
+* [Puppet Labs community guildelines](http://docs.puppetlabs.com/community/community_guidelines.html)
 * [Bug tracker (Jira)](http://tickets.puppetlabs.com)
 * [Contributor License Agreement](http://links.puppetlabs.com/cla)
 * [General GitHub documentation](http://help.github.com/)
 * [GitHub pull request documentation](http://help.github.com/send-pull-requests/)
-* #puppet-dev IRC channel on freenode.org
+* #puppet-dev IRC channel on freenode.org ([Archive](https://botbot.me/freenode/puppet-dev/))
+* [puppet-dev mailing list](https://groups.google.com/forum/#!forum/puppet-dev)
+* [Community PR Triage notes](https://github.com/puppet-community/community-triage/tree/master/core/notes)

data/Gemfile

@@ -25,7 +25,7 @@ end
 
 gem "puppet", :path => File.dirname(__FILE__), :require => false
 gem "facter", *location_for(ENV['FACTER_LOCATION'] || ['> 2.0', '< 4'])
-gem "hiera", *location_for(ENV['HIERA_LOCATION'] || ['> 1.0', '< 3'])
+gem "hiera", *location_for(ENV['HIERA_LOCATION'] || ['>= 2.0', '< 3'])
 gem "rake", "10.1.1", :require => false
 
 group(:development, :test) do

data/conf/environment.conf

@@ -11,6 +11,8 @@
 # Allowed settings and default values:
 
 # modulepath = ./modules:$basemodulepath
-# manifest = (default_manifest from puppet.conf; defaults to ./manifests)
+# manifest = (default_manifest from puppet.conf, which defaults to ./manifests)
 # config_version = (no script; Puppet will use the time the catalog was compiled)
-# environment_timeout = (environment_timeout from puppet.conf; defaults to unlimited)
+# environment_timeout = (environment_timeout from puppet.conf, which defaults to 0)
+    # Note: unless you have a specific reason, we recommend only setting
+    # environment_timeout in puppet.conf.

data/ext/build_defaults.yaml

@@ -28,15 +28,15 @@ build_msi:
       x64: 'cfacter-0.3.0-x64.zip'
     path: 'http://builds.puppetlabs.lan/cfacter/0.3.0/artifacts/windows'
   hiera:
-    ref: 'refs/tags/1.3.4'
+    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: 'aac9e790c9c3e59175e9d528f8aa517bb6caed76'
-      x64: '9e70b6ac8474678487f4330fecc2179158ae62f3'
+      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'

data/ext/debian/control

@@ -3,7 +3,7 @@ Section: admin
 Priority: optional
 Maintainer: Puppet Labs <info@puppetlabs.com>
 Uploaders: Micah Anderson <micah@debian.org>, Andrew Pollock <apollock@debian.org>, Nigel Kersten <nigel@explanatorygap.net>, Stig Sandbeck Mathisen <ssm@debian.org>
-Build-Depends-Indep: ruby | ruby-interpreter, libopenssl-ruby | libopenssl-ruby1.9.1 | libruby (>= 1:1.9.3.4), facter (>= 1.7.0), hiera (>= 1.0.0)
+Build-Depends-Indep: ruby | ruby-interpreter, libopenssl-ruby | libopenssl-ruby1.9.1 | libruby (>= 1:1.9.3.4), facter (>= 1.7.0), hiera (>= 2.0.0)
 Build-Depends: debhelper (>= 7.0.0), openssl
 Standards-Version: 3.9.1
 Vcs-Git: git://github.com/puppetlabs/puppet
@@ -11,7 +11,7 @@ Homepage: http://projects.puppetlabs.com/projects/puppet
 
 Package: puppet-common
 Architecture: all
-Depends: ${misc:Depends}, ruby | ruby-interpreter, libopenssl-ruby | libopenssl-ruby1.9.1 | libruby (>= 1:1.9.3.4), ruby-shadow | libshadow-ruby1.8, libaugeas-ruby | libaugeas-ruby1.9.1 | libaugeas-ruby1.8, lsb-base, sysv-rc (>= 2.86) | file-rc, hiera (>= 1.0.0), facter (>= 1.7.0), libjson-ruby | ruby-json
+Depends: ${misc:Depends}, ruby | ruby-interpreter, libopenssl-ruby | libopenssl-ruby1.9.1 | libruby (>= 1:1.9.3.4), ruby-shadow | libshadow-ruby1.8, libaugeas-ruby | libaugeas-ruby1.9.1 | libaugeas-ruby1.8, lsb-base, sysv-rc (>= 2.86) | file-rc, hiera (>= 2.0.0), facter (>= 1.7.0), libjson-ruby | ruby-json
 Recommends: lsb-release, debconf-utils
 Suggests: ruby-selinux | libselinux-ruby1.8
 Breaks: puppet (<< 2.6.0~rc2-1), puppetmaster (<< 0.25.4-1)

data/ext/project_data.yaml

@@ -16,7 +16,7 @@ gem_default_executables: 'puppet'
 gem_forge_project: 'puppet'
 gem_runtime_dependencies:
   facter: ['> 2.0', '< 4']
-  hiera: ['> 1.0', '< 3']
+  hiera: ['>= 2.0', '< 3']
   json_pure:
 gem_rdoc_options:
   - --title

data/ext/rack/config.ru

@@ -18,6 +18,7 @@ ARGV << "--confdir" << "/etc/puppetlabs/puppet"
 ARGV << "--vardir"  << "/opt/puppetlabs/server/data/puppetmaster"
 ARGV << "--logdir"  << "/var/log/puppetlabs/puppetmaster"
 ARGV << "--rundir"  << "/var/run/puppetlabs/puppetmaster"
+ARGV << "--codedir"  << "/etc/puppetlabs/code"
 
 # always_cache_features is a performance improvement and safe for a master to
 # apply. This is intended to allow agents to recognize new features that may be

data/ext/redhat/client.sysconfig

@@ -5,7 +5,7 @@
 #PUPPET_PORT=8140
 
 # Where to log to. Specify syslog to send log messages to the system log.
-#PUPPET_LOG=/var/log/puppet/puppet.log
+#PUPPET_LOG=/var/log/puppetlabs/puppet/puppet.log
 
 # You may specify other parameters to the puppet client here
 #PUPPET_EXTRA_OPTS=--waitforcert=500

data/ext/redhat/puppet.spec.erb

@@ -39,7 +39,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  facter >= 1:1.7.0
 # Puppet 3.x drops ruby 1.8.5 support and adds ruby 1.9 support
 BuildRequires:  ruby >= 1.8.7
-BuildRequires:  hiera >= 1.0.0
+BuildRequires:  hiera >= 2.0.0
 BuildArch:      noarch
 Requires:       ruby >= 1.8
 Requires:       ruby-shadow
@@ -58,7 +58,7 @@ Requires:       facter >= 1:1.7.0
 # Puppet 3.x drops ruby 1.8.5 support and adds ruby 1.9 support
 # Ruby 1.8.7 available for el5 at: yum.puppetlabs.com/el/5/devel/$ARCH
 Requires:       ruby >= 1.8.7
-Requires:       hiera >= 1.0.0
+Requires:       hiera >= 2.0.0
 Obsoletes:      hiera-puppet < 1.0.0
 Provides:       hiera-puppet >= 1.0.0
 %{!?_without_augeas:Requires: ruby-augeas}

data/ext/systemd/puppet.service

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

data/install.rb

@@ -211,7 +211,7 @@ def prepare_installation
     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|
+    opts.on('--logdir[=OPTIONAL]', 'Installation directory for log files', 'Default /var/log/puppetlabs/puppet') do |logdir|
       InstallOptions.logdir = logdir
     end
     opts.on('--bindir[=OPTIONAL]', 'Installation directory for binaries', 'overrides RbConfig::CONFIG["bindir"]') do |bindir|
@@ -299,7 +299,7 @@ def prepare_installation
   elsif $operatingsystem == "windows"
     logdir = File.join(Dir::COMMON_APPDATA, "PuppetLabs", "puppet", "var", "log")
   else
-    logdir = "/var/log/puppetlabs"
+    logdir = "/var/log/puppetlabs/puppet"
   end
 
   if not InstallOptions.bindir.nil?

data/lib/puppet/application/device.rb

@@ -115,9 +115,10 @@ parameter, so you can specify '--server <servername>' as an argument.
 
 * --detailed-exitcodes:
   Provide transaction information via exit codes. If this is enabled, an exit
-  code of '2' means there were changes, an exit code of '4' means there were
-  failures during the transaction, and an exit code of '6' means there were both
-  changes and failures.
+  code of '1' means at least one device had a compile failure, an exit code of
+  '2' means at least one device had resource changes, and an exit code of '4'
+  means at least one device had resource failures. Exit codes of '3', '5', '6',
+  or '7' means that a bitwise combination of the preceeding exit codes happened.
 
 * --help:
   Print this help message
@@ -167,9 +168,13 @@ Licensed under the Apache 2.0 License
       Puppet.err "No device found in #{Puppet[:deviceconfig]}"
       exit(1)
     end
-    devices.each_value do |device|
+    returns = devices.collect do |devicename,device|
       begin
-        Puppet.info "starting applying configuration to #{device.name} at #{device.url}"
+        device_url = URI.parse(device.url)
+        # Handle nil scheme & port
+        scheme = "#{device_url.scheme}://" if device_url.scheme
+        port = ":#{device_url.port}" if device_url.port
+        Puppet.info "starting applying configuration to #{device.name} at #{scheme}#{device_url.host}#{port}#{device_url.path}"
 
         # override local $vardir and $certname
         Puppet[:confdir] = ::File.join(Puppet[:devicedir], device.name)
@@ -192,6 +197,8 @@ Licensed under the Apache 2.0 License
         configurer.run(:network_device => true, :pluginsync => Puppet[:pluginsync])
       rescue => detail
         Puppet.log_exception(detail)
+        # If we rescued an error, then we return 1 as the exit code
+        1
       ensure
         Puppet[:vardir] = vardir
         Puppet[:confdir] = confdir
@@ -199,6 +206,16 @@ Licensed under the Apache 2.0 License
         Puppet::SSL::Host.reset
       end
     end
+    if ! returns or returns.compact.empty?
+      exit(1)
+    elsif options[:detailed_exitcodes]
+      # Bitwise OR the return codes together, puppet style
+      exit(returns.compact.reduce(:|))
+    elsif returns.include? 1
+      exit(1)
+    else
+      exit(0)
+    end
   end
 
   def setup_host

data/lib/puppet/data_providers.rb

@@ -17,12 +17,15 @@ module Puppet::DataProviders
   MODULE_NAME = 'module_name'.freeze
 
   def self.lookup_in_module(name, scope, merge)
-    # Do not attempt to do a lookup in a module if evaluated code is not in a module
-    # which is detected by checking if "MODULE_NAME" exists in scope
-    return nil unless scope.exist?(MODULE_NAME)
+    # Do not attempt to do a lookup in a module unless the name is qualified.
+    qual_index = name.index('::')
+    throw :no_such_key if qual_index.nil?
+    module_name = name[0..qual_index-1]
 
     assert_loaded()
     adapter = Puppet::DataProviders::DataAdapter.adapt(Puppet.lookup(:current_environment))
-    adapter.module_provider(scope[MODULE_NAME]).lookup(name, scope, merge)
+    data_provider = adapter.module_provider(module_name)
+    throw :no_such_key if data_provider.nil?
+    data_provider.lookup(name, scope, merge)
   end
 end

data/lib/puppet/data_providers/data_adapter.rb

@@ -29,7 +29,12 @@ class Puppet::DataProviders::DataAdapter < Puppet::Pops::Adaptable::Adapter
   end
 
   def module_provider(module_name)
-    @data[module_name] ||= initialize_module_provider(module_name)
+    # Test if the key is present for the given module_name. It might be there even if the
+    # value is nil (which indicates that no module provider is configured for the given name)
+    unless @data.include?(module_name)
+      @data[module_name] = initialize_module_provider(module_name)
+    end
+    @data[module_name]
   end
 
   def self.create_adapter(environment)

data/lib/puppet/data_providers/data_function_support.rb

@@ -5,15 +5,26 @@ module Puppet::DataProviders::DataFunctionSupport
   # This makes it possible to return data that is tailored for the request.
   # The class including this module must implement `loader(scope)` to return the apropriate loader.
   #
-  def data(key, scope)
+  # If a block is given, it will be called to validate the data hash when it is retrieved from a function call. The
+  # block must return the validated data or raise a {Puppet::Error} to indicate that the data is invalid.
+  # The block is not called when the data is found in the compiler or in the cache.
+  #
+  # @param key [String] The data key such as the name of a module or the constant 'environment'
+  # @param scope [Parser::Scope] The scope
+  # @return [Hash] The data hash for the given _key_
+  # @yield An optional block that can be used for validation of the data returned from the function
+  # @yieldparam [Hash] data The data to validate
+  # @yieldreturn [Hash] The validated data
+  #
+  def data(key, scope, &block)
     compiler = scope.compiler
     adapter = Puppet::DataProviders::DataAdapter.get(compiler) || Puppet::DataProviders::DataAdapter.adapt(compiler)
-    adapter.data[key] ||= initialize_data_from_function("#{key}::data", scope)
+    adapter.data[key] ||= initialize_data_from_function("#{key}::data", key, scope, &block)
   end
 
-  def initialize_data_from_function(name, scope)
+  def initialize_data_from_function(name, key, scope)
     Puppet::Util::Profiler.profile("Called #{name}", [ :functions, name ]) do
-      loader = loader(scope)
+      loader = loader(key, scope)
       if loader && func = loader.load(:function, name)
         # function found, call without arguments, must return a Hash
         # TODO: Validate the function - to ensure it does not contain unwanted side effects
@@ -23,6 +34,8 @@ module Puppet::DataProviders::DataFunctionSupport
         unless result.is_a?(Hash)
           raise Puppet::Error.new("Expected '#{name}' function to return a Hash, got #{result.class}")
         end
+        # validate result if block given
+        result = yield(result) if block_given?
       else
         raise Puppet::Error.new("Data from 'function' cannot find the required '#{name}' function")
       end

data/lib/puppet/data_providers/function_env_data_provider.rb

@@ -21,7 +21,7 @@ class Puppet::DataProviders::FunctionEnvDataProvider < Puppet::Plugins::DataProv
     end
   end
 
-  def loader(scope)
+  def loader(key, scope)
     # This loader allows the data function to be private or public in the environment
     scope.compiler.loaders.private_environment_loader
   end

data/lib/puppet/data_providers/function_module_data_provider.rb

@@ -13,17 +13,19 @@ class Puppet::DataProviders::FunctionModuleDataProvider < Puppet::Plugins::DataP
   include Puppet::DataProviders::DataFunctionSupport
 
   def lookup(name, scope, merge)
-    # If the module name does not exist, this call is not from within a module, and should be ignored.
-    unless scope.exist?(MODULE_NAME)
-      return nil
-    end
-    # Get the module name. Calls to the lookup method should only be performed for modules that have opted in
-    # by specifying that they use the 'function' implementation as the module_data provider. Thus, this will error
-    # out if a module specified 'function' but did not provide a function called <module-name>::data
-    #
-    module_name = scope[MODULE_NAME]
+    # Do not attempt to do a lookup in a module unless the name is qualified.
+    qual_index = name.index('::')
+    throw :no_such_key if qual_index.nil?
+    module_name = name[0..qual_index-1]
     begin
-      hash = data(module_name, scope)
+      hash = data(module_name, scope) do | data |
+        module_prefix = "#{module_name}::"
+        data.each_pair do |k,v|
+          unless k.is_a?(String) && k.start_with?(module_prefix)
+            raise Puppet::Error, "Module data for module '#{module_name}' must use keys qualified with the name of the module"
+          end
+        end
+      end
       throw :no_such_key unless hash.include?(name)
       hash[name]
     rescue *Puppet::Error => detail
@@ -31,14 +33,7 @@ class Puppet::DataProviders::FunctionModuleDataProvider < Puppet::Plugins::DataP
     end
   end
 
-  def loader(scope)
-    loaders = scope.compiler.loaders
-    if scope.exist?(MODULE_NAME)
-      loaders.private_loader_for_module(scope[MODULE_NAME])
-    else
-      # Produce the environment's loader when not in a module
-      # This loader allows the data function to be private or public in the environment
-      loaders.private_environment_loader
-    end
+  def loader(key, scope)
+    scope.compiler.loaders.private_loader_for_module(key)
   end
 end

data/lib/puppet/defaults.rb

@@ -452,10 +452,33 @@ module Puppet
     :environment_timeout => {
       :default    => "0",
       :type       => :ttl,
-      :desc       => "The time to live for a cached environment.
+      :desc       => "How long the Puppet master should cache data it loads from an
+      environment.
       #{AS_DURATION}
-      This setting can also be set to `unlimited`, which causes the environment to
-      be cached until the master is restarted."
+      A value of `0` will disable caching. This setting can also be set to
+      `unlimited`, which will cache environments until the master is restarted
+      or told to refresh the cache.
+
+      You should change this setting once your Puppet deployment is doing
+      non-trivial work. We chose the default value of `0` because it lets new
+      users update their code without any extra steps, but it lowers the
+      performance of your Puppet master.
+
+      We recommend setting this to `unlimited` and explicitly refreshing your
+      Puppet master as part of your code deployment process.
+
+      * With Puppet Server, you should refresh environments by calling the
+        `environment-cache` API endpoint. See the docs for the Puppet Server
+        administrative API.
+      * With a Rack Puppet master, you should restart the web server or the
+        application server. Passenger lets you touch a `restart.txt` file to
+        refresh an application without restarting Apache; see the Passenger docs
+        for details.
+
+      We don't recommend using any value other than `0` or `unlimited`, since
+      most Puppet masters use a pool of Ruby interpreters which all have their
+      own cache timers. When these timers drift out of sync, agents can be served
+      inconsistent catalogs."
     },
     :environment_data_provider => {
       :default    => "none",
@@ -1010,15 +1033,6 @@ EOT
       this is the port to listen on; for puppet agent, this is the port
       to make requests on. Both applications use this setting to get the port.",
     },
-    :master_url_prefix => {
-        :default => "/puppet",
-        :desc    => "The prefix at which the puppet master API is mounted.",
-        :hook    => proc do |value|
-          if !value.start_with?("/")
-            Puppet[:master_url_prefix] = "/#{value}"
-          end
-        end
-    },
     :node_name => {
       :default    => "cert",
       :desc       => "How the puppet master determines the client's identity
@@ -1418,14 +1432,27 @@ EOT
     :graph => {
       :default  => false,
       :type     => :boolean,
-      :desc     => "Whether to create dot graph files for the different
-        configuration graphs.  These dot files can be interpreted by tools
-        like OmniGraffle or dot (which is part of ImageMagick).",
+      :desc     => "Whether to create .dot graph files, which let you visualize the
+        dependency and containment relationships in Puppet's catalog. You
+        can load and view these files with tools like
+        [OmniGraffle](http://www.omnigroup.com/applications/omnigraffle/) (OS X)
+        or [graphviz](http://www.graphviz.org/) (multi-platform).
+
+        Graph files are created when _applying_ a catalog, so this setting
+        should be used on nodes running `puppet agent` or `puppet apply`.
+
+        The `graphdir` setting determines where Puppet will save graphs. Note
+        that we don't save graphs for historical runs; Puppet will replace the
+        previous .dot files with new ones every time it applies a catalog.
+
+        See your graphing software's documentation for details on opening .dot
+        files. If you're using GraphViz's `dot` command, you can do a quick PNG
+        render with `dot -Tpng <DOT FILE> -o <OUTPUT FILE>`.",
     },
     :graphdir => {
       :default    => "$statedir/graphs",
       :type       => :directory,
-      :desc       => "Where to store dot-outputted graphs.",
+      :desc       => "Where to save .dot-format graphs (when the `graph` setting is enabled).",
     },
     :waitforcert => {
       :default  => "2m",