puppet 4.5.3-x64-mingw32 → 4.6.1-x64-mingw32

data/lib/puppet/provider/package/pkgdmg.rb

@@ -9,7 +9,7 @@
 # in /var/db/.puppet_pkgdmg_installed_<name>
 
 require 'puppet/provider/package'
-require 'puppet/util/plist' if Puppet.features.cfpropertylist?
+require 'puppet/util/plist'
 require 'puppet/util/http_proxy'
 
 Puppet::Type.type(:package).provide :pkgdmg, :parent => Puppet::Provider::Package do
@@ -75,7 +75,7 @@ Puppet::Type.type(:package).provide :pkgdmg, :parent => Puppet::Provider::Packag
     end
 
     unless source =~ /\.dmg$/i || source =~ /\.pkg$/i
-      raise Puppet::Error.new("Mac OS X PKG DMG's must specify a source string ending in .dmg or flat .pkg file")
+      raise Puppet::Error.new("Mac OS X PKG DMGs must specify a source string ending in .dmg or flat .pkg file")
     end
     require 'open-uri' # Dead code; this is never used. The File.open call 20-ish lines south of here used to be Kernel.open but changed in '09. -NF
     cached_source = source
@@ -142,10 +142,10 @@ Puppet::Type.type(:package).provide :pkgdmg, :parent => Puppet::Provider::Packag
   def install
     source = nil
     unless source = @resource[:source]
-      raise Puppet::Error.new("Mac OS X PKG DMG's must specify a package source.")
+      raise Puppet::Error.new("Mac OS X PKG DMGs must specify a package source.")
     end
     unless name = @resource[:name]
-      raise Puppet::Error.new("Mac OS X PKG DMG's must specify a package name.")
+      raise Puppet::Error.new("Mac OS X PKG DMGs must specify a package name.")
     end
     self.class.installpkgdmg(source,name)
   end

data/lib/puppet/provider/package/pkgin.rb

@@ -25,7 +25,7 @@ Puppet::Type.type(:package).provide :pkgin, :parent => Puppet::Provider::Package
 
   def self.prefetch(packages)
     super
-    # Withouth -f, no fresh pkg_summary files are downloaded
+    # Without -f, no fresh pkg_summary files are downloaded
     pkgin("-yf", :update)
   end
 

data/lib/puppet/provider/package/pkgutil.rb

@@ -78,7 +78,7 @@ Puppet::Type.type(:package).provide :pkgutil, :parent => :sun, :source => :sun d
   # Turn our pkgutil -c listing into a hash for a single package.
   def pkgsingle(resource)
     # The --single option speeds up the execution, because it queries
-    # the package managament system for one package only.
+    # the package management system for one package only.
     command = ["-c", "--single", resource[:name]]
     self.class.parse_pkglist(run_pkgutil(resource, command), { :justme => resource[:name] })
   end

data/lib/puppet/provider/package/portage.rb

@@ -25,12 +25,13 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa
     result_fields = self.eix_result_fields
 
     version_format = self.eix_version_format
+    slot_versions_format = self.eix_slot_versions_format
     begin
       eix_file = File.directory?("/var/cache/eix") ? "/var/cache/eix/portage.eix" : "/var/cache/eix"
       update_eix if !FileUtils.uptodate?(eix_file, %w{/usr/bin/eix /usr/portage/metadata/timestamp})
 
       search_output = nil
-      Puppet::Util.withenv :LASTVERSION => version_format do
+      Puppet::Util.withenv :LASTVERSION => version_format, :LASTSLOTVERSIONS => slot_versions_format do
         search_output = eix *(self.eix_search_arguments + ["--installed"])
       end
 
@@ -59,7 +60,7 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa
     name = package_name
     unless should == :present or should == :latest
       # We must install a specific version
-      name = "=#{name}-#{should}"
+      name = package_atom_with_version(should)
     end
     emerge name
   end
@@ -69,6 +70,24 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa
     @resource[:category] ? "#{@resource[:category]}/#{@resource[:name]}" : @resource[:name]
   end
 
+  def package_name_without_slot
+    package_name.sub(self.class.slot_pattern, '')
+  end
+
+  def package_slot
+    if match = package_name.match(self.class.slot_pattern)
+      match[1]
+    end
+  end
+
+  def package_atom_with_version(version)
+    if slot = package_slot
+      "=#{package_name_without_slot}-#{version}:#{package_slot}"
+    else
+      "=#{package_name}-#{version}"
+    end
+  end
+
   def uninstall
     emerge "--unmerge", package_name
   end
@@ -86,15 +105,16 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa
     result_fields = self.class.eix_result_fields
 
     version_format = self.class.eix_version_format
-    search_field = package_name.count('/') > 0 ? "--category-name" : "--name"
-    search_value = package_name
+    slot_versions_format = self.class.eix_slot_versions_format
+    search_field = package_name_without_slot.count('/') > 0 ? "--category-name" : "--name"
+    search_value = package_name_without_slot
 
     begin
       eix_file = File.directory?("/var/cache/eix") ? "/var/cache/eix/portage.eix" : "/var/cache/eix"
       update_eix if !FileUtils.uptodate?(eix_file, %w{/usr/bin/eix /usr/portage/metadata/timestamp})
 
       search_output = nil
-      Puppet::Util.withenv :LASTVERSION => version_format do
+      Puppet::Util.withenv :LASTVERSION => version_format, :LASTSLOTVERSIONS => slot_versions_format do
         search_output = eix *(self.class.eix_search_arguments + ["--exact",search_field,search_value])
       end
 
@@ -107,6 +127,10 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa
           result_fields.zip(match.captures) do |field, value|
             package[field] = value unless !value or value.empty?
           end
+          if package_slot
+            package[:version_available] = eix_get_version_for_slot(package[:slot_versions_available], package_slot)
+            package[:ensure] = eix_get_version_for_slot(package[:installed_slots], package_slot)
+          end
           package[:ensure] = package[:ensure] ? package[:ensure] : :absent
           packages << package
         end
@@ -131,22 +155,38 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa
   end
 
   private
+  def eix_get_version_for_slot(versions_and_slots, slot)
+    return nil if versions_and_slots.nil?
+    versions_and_slots = versions_and_slots.split(",")
+    versions_and_slots.map! { |version_and_slot| version_and_slot.split(":") }
+    version_for_slot = versions_and_slots.find { |version_and_slot| version_and_slot.last == slot }
+    version_for_slot.first if version_for_slot
+  end
+
+  def self.slot_pattern
+    /:([\w+.\/*=-]+)$/
+  end
+
   def self.eix_search_format
-    "'<category> <name> [<installedversions:LASTVERSION>] [<bestversion:LASTVERSION>] <homepage> <description>\n'"
+    "'<category> <name> [<installedversions:LASTVERSION>] [<bestversion:LASTVERSION>] [<installedversions:LASTSLOTVERSIONS>] [<bestslotversions:LASTSLOTVERSIONS>] <homepage> <description>\n'"
   end
 
   def self.eix_result_format
-    /^(\S+)\s+(\S+)\s+\[(\S*)\]\s+\[(\S*)\]\s+(\S+)\s+(.*)$/
+    /^(\S+)\s+(\S+)\s+\[(\S*)\]\s+\[(\S*)\]\s+\[(\S*)\]\s+\[(\S*)\]\s+(\S+)\s+(.*)$/
   end
 
   def self.eix_result_fields
-    [:category, :name, :ensure, :version_available, :vendor, :description]
+    [:category, :name, :ensure, :version_available, :installed_slots, :slot_versions_available, :vendor, :description]
   end
 
   def self.eix_version_format
     "{last}<version>{}"
   end
 
+  def self.eix_slot_versions_format
+    "{!first},{}<version>:<slot>"
+  end
+
   def self.eix_search_arguments
     ["--nocolor", "--pure-packages", "--format",self.eix_search_format]
   end

data/lib/puppet/provider/package/sun.rb

@@ -75,7 +75,7 @@ Puppet::Type.type(:package).provide :sun, :parent => Puppet::Provider::Package d
       end
       return self.class.namemap(pkgs[0]) if errmsg.nil?
       # according to commit 41356a7 some errors do not raise an exception
-      # so eventhough pkginfo passed, we have to check the actual output
+      # so even though pkginfo passed, we have to check the actual output
       raise Puppet::Error, "Unable to get information about package #{@resource[:name]} because of: #{errmsg}"
     rescue Puppet::ExecutionFailure
       return {:ensure => :absent}

data/lib/puppet/provider/package/tdnf.rb

@@ -0,0 +1,28 @@
+Puppet::Type.type(:package).provide :tdnf, :parent => :dnf do
+  desc "Support via `tdnf`.
+
+  This provider supports the `install_options` attribute, which allows command-line flags to be passed to tdnf.
+  These options should be spcified as a string (e.g. '--flag'), a hash (e.g. {'--flag' => 'value'}), or an
+  array where each element is either a string or a hash."
+
+  has_feature :install_options, :versionable, :virtual_packages
+
+  commands :cmd => "tdnf", :rpm => "rpm"
+
+  # Note: this confine was borrowed from the Yum provider. The
+  # original purpose (from way back in 2007) was to make sure we
+  # never try to use RPM on a machine without it. We think this
+  # has probably become obsolete with the way `commands` work, so
+  # we should investigate removing it at some point.
+  if command('rpm')
+    confine :true => begin
+      rpm('--version')
+      rescue Puppet::ExecutionFailure
+        false
+      else
+        true
+      end
+  end
+
+  defaultfor :operatingsystem => "PhotonOS" 
+end

data/lib/puppet/provider/package/yum.rb

@@ -130,9 +130,22 @@ Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do
     '0'
   end
 
+  def self.update_command
+    # In yum both `upgrade` and `update` can be used to update packages
+    # `yum upgrade` == `yum --obsoletes update`
+    # Quote the DNF docs:
+    # "Yum does this if its obsoletes config option is enabled but
+    # the behavior is not properly documented and can be harmful."
+    # So we'll stick with the safter option
+    # If a user wants to remove obsoletes, they can use { :install_options => '--obsoletes' }
+    # More detail here: https://bugzilla.redhat.com/show_bug.cgi?id=1096506
+    'update'
+  end
+
   def install
     wanted = @resource[:name]
     error_level = self.class.error_level
+    update_command = self.class.update_command
     # If not allowing virtual packages, do a query to ensure a real package exists
     unless @resource.allow_virtual?
       execute([command(:cmd), '-d', '0', '-e', error_level, '-y', install_options, :list, wanted].compact)
@@ -154,10 +167,15 @@ Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do
         wanted.gsub!(/(.+)(#{ARCH_REGEX})(.+)/,'\1\3\2')
       end
 
-      is = self.query
-      if is && rpm_compareEVR(rpm_parse_evr(should), rpm_parse_evr(is[:ensure])) < 0
-        self.debug "Downgrading package #{@resource[:name]} from version #{is[:ensure]} to #{should}"
-        operation = :downgrade
+      current_package = self.query
+      if current_package
+        if rpm_compareEVR(rpm_parse_evr(should), rpm_parse_evr(current_package[:ensure])) < 0
+          self.debug "Downgrading package #{@resource[:name]} from version #{current_package[:ensure]} to #{should}"
+          operation = :downgrade
+        elsif rpm_compareEVR(rpm_parse_evr(should), rpm_parse_evr(current_package[:ensure])) > 0
+          self.debug "Upgrading package #{@resource[:name]} from version #{current_package[:ensure]} to #{should}"
+          operation = update_command
+        end
       end
     end
 

data/lib/puppet/provider/parsedfile.rb

@@ -109,7 +109,7 @@ class Puppet::Provider::ParsedFile < Puppet::Provider
   # An optional regular expression matched by third party headers.
   #
   # For example, this can be used to filter the vixie cron headers as
-  # erronously exported by older cron versions.
+  # erroneously exported by older cron versions.
   #
   # @api private
   # @abstract Providers based on ParsedFile may implement this to make it
@@ -120,7 +120,7 @@ class Puppet::Provider::ParsedFile < Puppet::Provider
   #   The expression must be tailored to match exactly one third party header.
   # @see drop_native_header
   # @note When specifying regular expressions in multiline mode, avoid
-  #   greedy repititions such as '.*' (use .*? instead). Otherwise, the
+  #   greedy repetitions such as '.*' (use .*? instead). Otherwise, the
   #   provider may drop file content between sparse headers.
   def self.native_header_regex
     nil

data/lib/puppet/provider/service/base.rb

@@ -57,7 +57,7 @@ Puppet::Type.type(:service).provide :base, :parent => :service do
       # Don't fail when the exit status is not 0.
       ucommand(:status, false)
 
-      # Expicitly calling exitstatus to facilitate testing
+      # Explicitly calling exitstatus to facilitate testing
       if $CHILD_STATUS.exitstatus == 0
         return :running
       else

data/lib/puppet/provider/service/bsd.rb

@@ -40,7 +40,7 @@ Puppet::Type.type(:service).provide :bsd, :parent => :init do
   end
 
   # Override stop/start commands to use one<cmd>'s and the avoid race condition
-  # where provider trys to stop/start the service before it is enabled
+  # where provider tries to stop/start the service before it is enabled
   def startcmd
     [self.initscript, :onestart]
   end

data/lib/puppet/provider/service/daemontools.rb

@@ -17,7 +17,7 @@ Puppet::Type.type(:service).provide :daemontools, :parent => :base do
     * `/var/lib/service`
     * `/etc`
 
-    ...or this can be overriden in the resource's attributes:
+    ...or this can be overridden in the resource's attributes:
 
         service { 'myservice':
           provider => 'daemontools',
@@ -106,7 +106,7 @@ Puppet::Type.type(:service).provide :daemontools, :parent => :base do
   end
 
   # returns the full path to the current daemon directory
-  # note that this path can be overriden in the resource
+  # note that this path can be overridden in the resource
   # definition
   def daemon
     File.join(resource[:path], resource[:name])

data/lib/puppet/provider/service/debian.rb

@@ -17,7 +17,7 @@ Puppet::Type.type(:service).provide :debian, :parent => :init do
   commands :invoke_rc => "/usr/sbin/invoke-rc.d"
   commands :service => "/usr/sbin/service"
 
-  defaultfor :operatingsystem => :cumuluslinux
+  defaultfor :operatingsystem => :cumuluslinux, :operatingsystemmajrelease => ['1','2']
   defaultfor :operatingsystem => :debian, :operatingsystemmajrelease => ['5','6','7']
 
   # Remove the symlinks
@@ -42,9 +42,9 @@ Puppet::Type.type(:service).provide :debian, :parent => :init do
       return :true
     elsif [101, 105].include?($CHILD_STATUS.exitstatus)
       # 101 is action not allowed, which means we have to do the check manually.
-      # 105 is unknown, which generally means the iniscript does not support query
+      # 105 is unknown, which generally means the initscript does not support query
       # The debian policy states that the initscript should support methods of query
-      # For those that do not, peform the checks manually
+      # For those that do not, perform the checks manually
       # http://www.debian.org/doc/debian-policy/ch-opersys.html
       if get_start_link_count >= 4
         return :true

data/lib/puppet/provider/service/init.rb

@@ -11,6 +11,8 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
       "/sbin/init.d"
     when "Archlinux"
       "/etc/rc.d"
+    when "AIX"
+      "/etc/rc.d/init.d"
     else
       "/etc/init.d"
     end
@@ -28,7 +30,7 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
   #confine :exists => defpath
 
   # some init scripts are not safe to execute, e.g. we do not want
-  # to suddently run /etc/init.d/reboot.sh status and reboot our system. The
+  # to suddenly run /etc/init.d/reboot.sh status and reboot our system. The
   # exclude list could be platform agnostic but I assume an invalid init script
   # on system A will never be a valid init script on system B
   def self.excludes
@@ -46,7 +48,7 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
     # launchpad bug
     # (https://bugs.launchpad.net/ubuntu/+source/upstart/+bug/962047) that may
     # eventually explain how to use the wait-for-state service or perhaps why
-    # it should remain excluded. When that bug is adddressed this should be
+    # it should remain excluded. When that bug is addressed this should be
     # reexamined.
     excludes += %w{wait-for-state portmap-wait}
     # these excludes were found with grep -r -L start /etc/init.d
@@ -153,7 +155,7 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
     raise Puppet::Error, "Could not find init script for '#{name}'"
   end
 
-  # The start command is just the init scriptwith 'start'.
+  # The start command is just the init script with 'start'.
   def startcmd
     [initscript, :start]
   end

data/lib/puppet/provider/service/launchd.rb

@@ -1,4 +1,4 @@
-require 'puppet/util/plist' if Puppet.features.cfpropertylist?
+require 'puppet/util/plist'
 Puppet::Type.type(:service).provide :launchd, :parent => :base do
   desc <<-'EOT'
     This provider manages jobs with `launchd`, which is the default service
@@ -35,7 +35,7 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
     Note that this allows you to do something `launchctl` can't do, which is to
     be in a state of "stopped/enabled" or "running/disabled".
 
-    Note that this provider does not support overriding 'restart' or 'status'.
+    Note that this provider does not support overriding 'restart'
 
   EOT
 
@@ -219,6 +219,20 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
     [job_path, job_plist]
   end
 
+  # when a service includes hasstatus=>false, we override the launchctl
+  # status mechanism and fall back to the base provider status method.
+  def status
+    if @resource && ((@resource[:hasstatus] == :false) || (@resource[:status]))
+      return super
+    else
+      if @property_hash[:status].nil?
+        :absent
+      else
+        @property_hash[:status]
+      end
+    end
+  end
+
   # start the service. To get to a state of running/enabled, we need to
   # conditionally enable at load, then disable by modifying the plist file
   # directly.

data/lib/puppet/provider/service/runit.rb

@@ -17,7 +17,7 @@ Puppet::Type.type(:service).provide :runit, :parent => :daemontools do
     * `/etc/sv`
     * `/var/lib/service`
 
-    or this can be overriden in the service resource parameters::
+    or this can be overridden in the service resource parameters:
 
         service { 'myservice':
           provider => 'runit',

data/lib/puppet/provider/service/smf.rb

@@ -21,6 +21,8 @@ Puppet::Type.type(:service).provide :smf, :parent => :base do
   commands :adm => "/usr/sbin/svcadm", :svcs => "/usr/bin/svcs"
   commands :svccfg => "/usr/sbin/svccfg"
 
+  has_feature :refreshable
+
   def setupservice
       if resource[:manifest]
         [command(:svcs), "-l", @resource[:name]]
@@ -64,7 +66,12 @@ Puppet::Type.type(:service).provide :smf, :parent => :base do
   end
 
   def restartcmd
-    [command(:adm), :restart, @resource[:name]]
+    if Puppet::Util::Package.versioncmp(Facter.value(:operatingsystemrelease), '11.2') >= 0
+      [command(:adm), :restart, "-s", @resource[:name]]
+    else
+      # Synchronous restart only supported in Solaris 11.2 and above
+      [command(:adm), :restart, @resource[:name]]
+    end
   end
 
   def startcmd

data/lib/puppet/provider/service/systemd.rb

@@ -23,7 +23,8 @@ Puppet::Type.type(:service).provide :systemd, :parent => :base do
   defaultfor :osfamily => :redhat, :operatingsystem => :fedora
   defaultfor :osfamily => :suse
   defaultfor :operatingsystem => :debian, :operatingsystemmajrelease => "8"
-  defaultfor :operatingsystem => :ubuntu, :operatingsystemmajrelease => ["15.04","15.10","16.04"]
+  defaultfor :operatingsystem => :ubuntu, :operatingsystemmajrelease => ["15.04","15.10","16.04","16.10"]
+  defaultfor :operatingsystem => :cumuluslinux, :operatingsystemmajrelease => ["3"]
 
   def self.instances
     i = []
@@ -72,6 +73,7 @@ Puppet::Type.type(:service).provide :systemd, :parent => :base do
 
   def enabled?
     output = cached_enabled?
+    code = $CHILD_STATUS.exitstatus
 
     # The masked state is equivalent to the disabled state in terms of
     # comparison so we only care to check if it is masked if we want to keep
@@ -80,9 +82,8 @@ Puppet::Type.type(:service).provide :systemd, :parent => :base do
     # We only return :mask if we're trying to mask the service. This prevents
     # flapping when simply trying to disable a masked service.
     return :mask if (@resource[:enable] == :mask) && (output == 'masked')
-    return :true if ['static', 'enabled'].include? output
-    return :false if ['disabled', 'linked', 'indirect', 'masked'].include? output
-    if (output.empty?) && (Facter.value(:osfamily).downcase == 'debian')
+    return :true if (code == 0)
+    if (output.empty?) && (code > 0) && (Facter.value(:osfamily).downcase == 'debian')
       ret = debian_enabled?
       return ret if ret
     end
@@ -101,9 +102,9 @@ Puppet::Type.type(:service).provide :systemd, :parent => :base do
       return :true
     elsif [101, 105].include?($CHILD_STATUS.exitstatus)
       # 101 is action not allowed, which means we have to do the check manually.
-      # 105 is unknown, which generally means the iniscript does not support query
+      # 105 is unknown, which generally means the initscript does not support query
       # The debian policy states that the initscript should support methods of query
-      # For those that do not, peform the checks manually
+      # For those that do not, perform the checks manually
       # http://www.debian.org/doc/debian-policy/ch-opersys.html
       if get_start_link_count >= 4
         return :true
@@ -145,5 +146,37 @@ Puppet::Type.type(:service).provide :systemd, :parent => :base do
   def statuscmd
     [command(:systemctl), "is-active", @resource[:name]]
   end
+
+  def restart
+    begin
+      super
+    rescue Puppet::Error => e
+      raise Puppet::Error.new(prepare_error_message(@resource[:name], 'restart', e))
+    end
+  end
+
+  def start
+    begin
+      super
+    rescue Puppet::Error => e
+      raise Puppet::Error.new(prepare_error_message(@resource[:name], 'start', e))
+    end
+  end
+
+  def stop
+    begin
+      super
+    rescue Puppet::Error => e
+      raise Puppet::Error.new(prepare_error_message(@resource[:name], 'stop', e))
+    end
+  end
+
+  def prepare_error_message(name, action, exception)
+    error_return = "Systemd #{action} for #{name} failed!\n"
+    journalctl_command = "journalctl -n 50 --since '5 minutes ago' -u #{name} --no-pager"
+    Puppet.debug("Runing journalctl command to get logs for systemd #{action} failure: #{journalctl_command}")
+    journalctl_output = execute(journalctl_command)
+    error_return << "journalctl log for #{name}:\n#{journalctl_output}"
+  end
 end