puppet 3.8.7 → 4.0.0.rc1

data/lib/puppet/type/maillist.rb

@@ -1,5 +1,5 @@
 module Puppet
-  newtype(:maillist) do
+  Type.newtype(:maillist) do
     @doc = "Manage email lists.  This resource type can only create
       and remove lists; it cannot currently reconfigure them."
 

data/lib/puppet/type/mount.rb

@@ -2,7 +2,7 @@ require 'puppet/property/boolean'
 
 module Puppet
   # We want the mount to refresh when it changes.
-  newtype(:mount, :self_refresh => true) do
+  Type.newtype(:mount, :self_refresh => true) do
     @doc = "Manages mounted filesystems, including putting mount
       information into the mount table. The actual behavior depends
       on the value of the 'ensure' parameter.
@@ -168,14 +168,12 @@ module Puppet
     end
 
     newproperty(:options) do
-      desc "Mount options for the mounts, comma-separated as they would appear
-      in the fstab on Linux. AIX options other than dev, nodename, or vfs may
-      be defined here. If specified, AIX options of account, boot, check, free,
-      mount, size, type, vol, log, and quota must be alphabetically sorted at
-      the end of the list."
+      desc "A single string containing options for the mount, as they would
+        appear in fstab. For many platforms this is a comma delimited string.
+        Consult the fstab(5) man page for system-specific details."
 
       validate do |value|
-        raise Puppet::Error, "option must not contain whitespace: #{value}" if value =~ /\s/
+        raise Puppet::Error, "options must not contain whitespace: #{value}" if value =~ /\s/
       end
     end
 
@@ -256,16 +254,8 @@ module Puppet
       newvalues(:true, :false)
       defaultto do
         case Facter.value(:operatingsystem)
-        when "FreeBSD", "Darwin", "DragonFly", "OpenBSD"
+        when "FreeBSD", "Darwin", "AIX", "DragonFly", "OpenBSD"
           false
-        when "AIX"
-          if Facter.value(:kernelmajversion) == "5300"
-            false
-          elsif resource[:device] and resource[:device].match(%r{^[^/]+:/})
-            false
-          else
-            true
-          end
         else
           true
         end

data/lib/puppet/type/notify.rb

@@ -3,7 +3,7 @@
 
 
 module Puppet
-  newtype(:notify) do
+  Type.newtype(:notify) do
     @doc = "Sends an arbitrary message to the agent run-time log."
 
     newproperty(:message) do

data/lib/puppet/type/package.rb

@@ -7,7 +7,7 @@ require 'puppet/parameter/package_options'
 require 'puppet/parameter/boolean'
 
 module Puppet
-  newtype(:package) do
+  Type.newtype(:package) do
     @doc = "Manage packages.  There is a basic dichotomy in package
       support right now:  Some package types (e.g., yum and apt) can
       retrieve their own package files, while others (e.g., rpm and sun)
@@ -20,10 +20,19 @@ module Puppet
       requires in order to function, and you must meet those requirements
       to use a given provider.
 
+      You can declare multiple package resources with the same `name`, as long
+      as they specify different providers and have unique titles.
+
+      Note that you must use the _title_ to make a reference to a package
+      resource; `Package[<NAME>]` is not a synonym for `Package[<TITLE>]` like
+      it is for many other resource types.
+
       **Autorequires:** If Puppet is managing the files specified as a
       package's `adminfile`, `responsefile`, or `source`, the package
       resource will autorequire those files."
 
+    feature :reinstallable, "The provider can reinstall packages.",
+      :methods => [:reinstall]
     feature :installable, "The provider can install packages.",
       :methods => [:install]
     feature :uninstallable, "The provider can uninstall packages.",
@@ -173,6 +182,10 @@ module Puppet
           # supports providers that can have multiple versions installed
           when *Array(is)
             return true
+          else
+            # We have version numbers, and no match. If the provider has
+            # additional logic, run it here.
+            return provider.insync?(is) if provider.respond_to?(:insync?)
           end
         }
 
@@ -197,9 +210,9 @@ module Puppet
     newparam(:name) do
       desc "The package name.  This is the name that the packaging
       system uses internally, which is sometimes (especially on Solaris)
-      a name that is basically useless to humans.  If you want to
-      abstract package installation, then you can use aliases to provide
-      a common name to packages:
+      a name that is basically useless to humans.  If a package goes by
+      several names, you can use a single title and then set the name
+      conditionally:
 
           # In the 'openssl' class
           $ssl = $operatingsystem ? {
@@ -207,11 +220,9 @@ module Puppet
             default => openssl
           }
 
-          # It is not an error to set an alias to the same value as the
-          # object name.
-          package { $ssl:
-            ensure => installed,
-            alias  => openssl
+          package { 'openssl':
+            name   => $ssl,
+            ensure => installed
           }
 
           . etc. .
@@ -221,12 +232,10 @@ module Puppet
             default => openssh
           }
 
-          # Use the alias to specify a dependency, rather than
-          # having another selector to figure it out again.
-          package { $ssh:
+          package { 'openssh':
+            name    => $ssh
             ensure  => installed,
-            alias   => openssh,
-            require => Package[openssl]
+            require => Package['openssl']
           }
 
       "
@@ -239,6 +248,37 @@ module Puppet
       end
     end
 
+    # We call providify here so that we can set provider as a namevar.
+    # Normally this method is called after newtype finishes constructing this
+    # Type class.
+    providify
+    paramclass(:provider).isnamevar
+
+    # We have more than one namevar, so we need title_patterns. However, we
+    # cheat and set the patterns to map to name only and completely ignore
+    # provider. So far, the logic that determines uniqueness appears to just
+    # "Do The Right Thing™" when the provider is explicitly set by the user.
+    #
+    # The following resources will be seen as uniqe by puppet:
+    #
+    #     # Uniqueness Key: ['mysql', nil]
+    #     package{'mysql': }
+    #
+    #     # Uniqueness Key: ['mysql', 'gem']
+    #     package{'gem-mysql':
+    #       name     => 'mysql,
+    #       provider => gem
+    #     }
+    #
+    # This does not handle the case where providers like 'yum' and 'rpm' should
+    # clash. Also, declarations that implicitly use the default provider will
+    # clash with those that explicitly use the default.
+    def self.title_patterns
+      # This is the default title pattern for all types, except hard-wired to
+      # set only name.
+      [ [ /(.*)/m, [ [:name] ] ] ]
+    end
+
     newproperty(:package_settings, :required_features=>:package_settings) do
       desc "Settings that can change the contents or configuration of a package.
 
@@ -438,8 +478,7 @@ module Puppet
     newparam(:allow_virtual, :boolean => true, :parent => Puppet::Parameter::Boolean, :required_features => :virtual_packages) do
       desc 'Specifies if virtual package names are allowed for install and uninstall.'
 
-      # In a future release, this should be defaulted to true
-      defaultto false
+      defaultto true
     end
 
     autorequire(:file) do
@@ -472,5 +511,41 @@ module Puppet
     def present?(current_values)
       super && current_values[:ensure] != :purged
     end
+
+    # This parameter exists to ensure backwards compatibility is preserved.
+    # See https://github.com/puppetlabs/puppet/pull/2614 for discussion.
+    # If/when a metaparameter for controlling how arbitrary resources respond
+    # to refreshing is created, that will supersede this, and this will be
+    # deprecated.
+    newparam(:reinstall_on_refresh) do
+      desc "Whether this resource should respond to refresh events (via `subscribe`,
+        `notify`, or the `~>` arrow) by reinstalling the package. Only works for
+        providers that support the `reinstallable` feature.
+
+        This is useful for source-based distributions, where you may want to
+        recompile a package if the build options change.
+
+        If you use this, be careful of notifying classes when you want to restart
+        services. If the class also contains a refreshable package, doing so could
+        cause unnecessary re-installs.
+
+        Defaults to `false`."
+      newvalues(:true, :false)
+
+      defaultto :false
+    end
+
+    # When a refresh event is triggered, calls reinstall on providers
+    # that support the reinstall_on_refresh parameter.
+    def refresh
+      if provider.reinstallable? &&
+        @parameters[:reinstall_on_refresh].value == :true &&
+        @parameters[:ensure].value != :purged &&
+        @parameters[:ensure].value != :absent &&
+        @parameters[:ensure].value != :held
+
+        provider.reinstall
+      end
+    end
   end
 end

data/lib/puppet/type/resources.rb

@@ -134,13 +134,6 @@ Puppet::Type.newtype(:resources) do
     @resource_type
   end
 
-  def self.deprecate_params(title,params)
-    return unless params
-    if title == 'cron' and ! params.select { |param| param.name.intern == :purge and param.value == true }.empty?
-      Puppet.deprecation_warning("Change notice: purging cron entries will be more aggressive in future versions, take care when updating your agents. See http://links.puppetlabs.com/puppet-aggressive-cron-purge")
-    end
-  end
-
   # Make sure we don't purge users with specific uids
   def user_check(resource)
     return true unless self[:name] == "user"

data/lib/puppet/type/router.rb

@@ -3,7 +3,7 @@
 
 
 module Puppet
-  newtype(:router) do
+  Type.newtype(:router) do
     @doc = "Manages connected router."
 
     newparam(:url) do

data/lib/puppet/type/schedule.rb

@@ -1,5 +1,5 @@
 module Puppet
-  newtype(:schedule) do
+  Type.newtype(:schedule) do
     @doc = <<-'EOT'
       Define schedules for Puppet. Resources can be limited to a schedule by using the
       [`schedule`](http://docs.puppetlabs.com/references/latest/metaparameter.html#schedule)

data/lib/puppet/type/scheduled_task.rb

@@ -102,9 +102,6 @@ Puppet::Type.newtype(:scheduled_task) do
           * `start_date` ---  The date when the trigger should first become active.
             Defaults to the current date. You should format dates as YYYY-MM-DD,
             although other date formats may work. (Under the hood, this uses `Date.parse`.)
-          * `minutes_interval` --- The repeat interval in minutes.
-          * `minutes_duration` --- The duration in minutes, needs to be greater than the
-            minutes_interval.
       * For `daily` triggers:
           * `every` --- How often the task should run, as a number of days. Defaults
             to 1. ("2" means every other day, "3" means every three days, etc.)
@@ -130,7 +127,6 @@ Puppet::Type.newtype(:scheduled_task) do
             when the task should run. Must be one of `first`, `second`, `third`,
             `fourth`, `fifth`, or `last`.
 
-
       Examples:
 
           # Run at 8am on the 1st, 15th, and last day of the month in January, March,
@@ -154,15 +150,6 @@ Puppet::Type.newtype(:scheduled_task) do
             day_of_week      => [mon],        # Must be specified
           }
 
-          # Run daily repeating every 30 minutes between 9am and 5pm (480 minutes) starting after August 31st, 2011.
-          trigger => {
-            schedule         => daily,
-            start_date       => '2011-08-31', # Defaults to current date
-            start_time       => '8:00',       # Must be specified
-            minutes_interval => 30,
-            minutes_duration => 480,
-          }
-
     EOT
 
     validate do |value|

data/lib/puppet/type/selboolean.rb

@@ -1,5 +1,5 @@
 module Puppet
-  newtype(:selboolean) do
+  Type.newtype(:selboolean) do
     @doc = "Manages SELinux booleans on systems with SELinux support.  The supported booleans
       are any of the ones found in `/selinux/booleans/`."
 
@@ -15,7 +15,7 @@ module Puppet
     end
 
     newparam(:persistent) do
-      desc "If set true, SELinux booleans will be written to disk and persist accross reboots.
+      desc "If set true, SELinux booleans will be written to disk and persist across reboots.
         The default is `false`."
 
       defaultto :false

data/lib/puppet/type/service.rb

@@ -7,7 +7,7 @@
 
 module Puppet
 
-  newtype(:service) do
+  Type.newtype(:service) do
     @doc = "Manage running services.  Service support unfortunately varies
       widely by platform --- some platforms have very little if any concept of a
       running service, and some have a very codified and powerful concept.

data/lib/puppet/type/ssh_authorized_key.rb

@@ -1,5 +1,5 @@
 module Puppet
-  newtype(:ssh_authorized_key) do
+  Type.newtype(:ssh_authorized_key) do
     @doc = "Manages SSH authorized keys. Currently only type 2 keys are supported.
 
       In their native habitat, SSH keys usually appear as a single long line. This

data/lib/puppet/type/sshkey.rb

@@ -1,5 +1,5 @@
 module Puppet
-  newtype(:sshkey) do
+  Type.newtype(:sshkey) do
     @doc = "Installs and manages ssh host keys.  At this point, this type
       only knows how to install keys into `/etc/ssh/ssh_known_hosts`.  See
       the `ssh_authorized_key` type to manage authorized keys."

data/lib/puppet/type/tidy.rb

@@ -20,6 +20,9 @@ Puppet::Type.newtype(:tidy) do
     desc "The path to the file or directory to manage.  Must be fully
       qualified."
     isnamevar
+    munge do |value|
+      File.expand_path(value)
+    end
   end
 
   newparam(:recurse) do
@@ -260,7 +263,7 @@ Puppet::Type.newtype(:tidy) do
     # so that a directory is emptied before we try to remove it.
     files_by_name = result.inject({}) { |hash, file| hash[file[:path]] = file; hash }
 
-    files_by_name.keys.sort { |a,b| b <=> b }.each do |path|
+    files_by_name.keys.sort { |a,b| b <=> a }.each do |path|
       dir = ::File.dirname(path)
       next unless resource = files_by_name[dir]
       if resource[:require]

data/lib/puppet/type/user.rb

@@ -6,7 +6,7 @@ require 'puppet/property/ordered_list'
 require 'puppet/property/keyvalue'
 
 module Puppet
-  newtype(:user) do
+  Type.newtype(:user) do
     @doc = "Manage users.  This type is mostly built to manage system
       users, so it is lacking some features useful for managing normal
       users.
@@ -57,6 +57,9 @@ module Puppet
     feature :manages_shell,
       "The provider allows for setting shell and validates if possible"
 
+    feature :manages_loginclass,
+      "The provider can manage the login class for a user."
+
     newproperty(:ensure, :parent => Puppet::Property::Ensure) do
       newvalue(:present, :event => :user_created) do
         provider.create
@@ -326,8 +329,8 @@ module Puppet
     newproperty(:expiry, :required_features => :manages_expiry) do
       desc "The expiry date for this user. Must be provided in
            a zero-padded YYYY-MM-DD format --- e.g. 2010-02-19.
-           If you want to make sure the user account does never
-           expire, you can pass the special value `absent`."
+           If you want to ensure the user account never expires,
+           you can pass the special value `absent`."
 
       newvalues :absent
       newvalues /^\d{4}-\d{2}-\d{2}$/
@@ -639,6 +642,16 @@ module Puppet
       end
     end
 
+    newproperty(:loginclass, :required_features => :manages_loginclass) do
+      desc "The name of login class to which the user belongs."
+
+      validate do |value|
+        if value =~ /^\d+$/
+          raise ArgumentError, "Class name must be provided."
+        end
+      end
+    end
+
     # Generate ssh_authorized_keys resources for purging. The key files are
     # taken from the purge_ssh_keys parameter. The generated resources inherit
     # all metaparameters from the parent user resource.

data/lib/puppet/type/yumrepo.rb

@@ -360,4 +360,30 @@ Puppet::Type.newtype(:yumrepo) do
 
     newvalues(YUM_BOOLEAN, :absent)
   end
+
+  newproperty(:assumeyes) do
+    desc "Determines if yum prompts for confirmation of critical actions.
+      #{YUM_BOOLEAN_DOC}
+      #{ABSENT_DOC}"
+
+    newvalues(YUM_BOOLEAN, :absent)
+  end
+
+  newproperty(:deltarpm_percentage) do
+    desc "Percentage value that determines when to use deltas for this repo.
+      When the delta is larger than this percentage value of the package, the
+      delta is not used.
+      #{ABSENT_DOC}"
+
+    newvalues(/^\d+$/, :absent)
+  end
+
+  newproperty(:deltarpm_metadata_percentage) do
+    desc "Percentage value that determines when to download deltarpm metadata.
+      When the deltarpm metadata is larger than this percentage value of the
+      package, deltarpm metadata is not downloaded.
+      #{ABSENT_DOC}"
+
+    newvalues(/^\d+$/, :absent)
+  end
 end

data/lib/puppet/type/zfs.rb

@@ -1,5 +1,5 @@
 module Puppet
-  newtype(:zfs) do
+  Type.newtype(:zfs) do
     @doc = "Manage zfs. Create destroy and set properties on zfs instances.
 
 **Autorequires:** If Puppet is managing the zpool at the root of this zfs

data/lib/puppet/type/zpool.rb

@@ -29,7 +29,7 @@ module Puppet
     end
   end
 
-  newtype(:zpool) do
+  Type.newtype(:zpool) do
     @doc = "Manage zpools. Create and delete zpools. The provider WILL NOT SYNC, only report differences.
 
       Supports vdevs with mirrors, raidz, logs and spares."