puppet 3.4.3 → 3.5.0.rc1

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

@@ -48,7 +48,7 @@ Puppet::Type.type(:service).provide :daemontools, :parent => :base do
     def defpath(dummy_argument=:work_arround_for_ruby_GC_bug)
       unless @defpath
         ["/var/lib/service", "/etc"].each do |path|
-          if Puppet::FileSystem::File.exist?(path)
+          if Puppet::FileSystem.exist?(path)
             @defpath = path
             break
           end
@@ -74,7 +74,7 @@ Puppet::Type.type(:service).provide :daemontools, :parent => :base do
     # or don't contain a run file
     Dir.entries(path).reject { |e|
       fullpath = File.join(path, e)
-      e =~ /^\./ or ! FileTest.directory?(fullpath) or ! Puppet::FileSystem::File.exist?(File.join(fullpath,"run"))
+      e =~ /^\./ or ! FileTest.directory?(fullpath) or ! Puppet::FileSystem.exist?(File.join(fullpath,"run"))
     }.collect do |name|
       new(:name => name, :path => path)
     end
@@ -89,7 +89,7 @@ Puppet::Type.type(:service).provide :daemontools, :parent => :base do
   def servicedir
     unless @servicedir
       ["/service", "/etc/service","/var/lib/svscan"].each do |path|
-        if Puppet::FileSystem::File.exist?(path)
+        if Puppet::FileSystem.exist?(path)
           @servicedir = path
           break
         end
@@ -119,7 +119,7 @@ Puppet::Type.type(:service).provide :daemontools, :parent => :base do
         return :running
       end
     rescue Puppet::ExecutionFailure => detail
-      raise Puppet::Error.new( "Could not get status for service #{resource.ref}: #{detail}" )
+      raise Puppet::Error.new( "Could not get status for service #{resource.ref}: #{detail}", detail)
     end
     :stopped
   end
@@ -132,7 +132,7 @@ Puppet::Type.type(:service).provide :daemontools, :parent => :base do
         system("#{command}")
       end
   rescue Puppet::ExecutionFailure => detail
-      raise Puppet::Error.new( "Cannot config #{self.service} to enable it: #{detail}" )
+      raise Puppet::Error.new( "Cannot config #{self.service} to enable it: #{detail}", detail)
   end
 
   def enabled?
@@ -142,23 +142,23 @@ Puppet::Type.type(:service).provide :daemontools, :parent => :base do
       return :true
     else
       # the service is enabled if it is linked
-      return Puppet::FileSystem::File.new(self.service).symlink? ? :true : :false
+      return Puppet::FileSystem.symlink?(self.service) ? :true : :false
     end
   end
 
   def enable
-      if ! FileTest.directory?(self.daemon)
-        Puppet.notice "No daemon dir, calling setupservice for #{resource[:name]}"
-        self.setupservice
-      end
-      if self.daemon
-        if ! Puppet::FileSystem::File.new(self.service).symlink?
-          Puppet.notice "Enabling #{self.service}: linking #{self.daemon} -> #{self.service}"
-          Puppet::FileSystem::File.new(self.daemon).symlink(self.service)
-        end
+    if ! FileTest.directory?(self.daemon)
+      Puppet.notice "No daemon dir, calling setupservice for #{resource[:name]}"
+      self.setupservice
+    end
+    if self.daemon
+      if ! Puppet::FileSystem.symlink?(self.service)
+        Puppet.notice "Enabling #{self.service}: linking #{self.daemon} -> #{self.service}"
+        Puppet::FileSystem.symlink(self.daemon, self.service)
       end
-  rescue Puppet::ExecutionFailure
-      raise Puppet::Error.new( "No daemon directory found for #{self.service}")
+    end
+rescue Puppet::ExecutionFailure
+    raise Puppet::Error.new( "No daemon directory found for #{self.service}", $!)
   end
 
   def disable
@@ -168,13 +168,13 @@ Puppet::Type.type(:service).provide :daemontools, :parent => :base do
         self.setupservice
       end
       if self.daemon
-        if Puppet::FileSystem::File.new(self.service).symlink?
+        if Puppet::FileSystem.symlink?(self.service)
           Puppet.notice "Disabling #{self.service}: removing link #{self.daemon} -> #{self.service}"
-          Puppet::FileSystem::File.unlink(self.service)
+          Puppet::FileSystem.unlink(self.service)
         end
       end
     rescue Puppet::ExecutionFailure
-      raise Puppet::Error.new( "No daemon directory found for #{self.service}")
+      raise Puppet::Error.new( "No daemon directory found for #{self.service}", $!)
     end
     self.stop
   end

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

@@ -39,7 +39,7 @@ Puppet::Type.type(:service).provide :debian, :parent => :init do
     if [104, 106].include?($CHILD_STATUS.exitstatus)
       return :true
     elsif [105].include?($CHILD_STATUS.exitstatus)
-      # 105 is unknown, which generally means the the iniscript does not support query
+      # 105 is unknown, which generally means the iniscript 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
       # http://www.debian.org/doc/debian-policy/ch-opersys.html

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

@@ -71,7 +71,7 @@ Puppet::Type.type(:service).provide :freebsd, :parent => :init do
     success = false
     # Replace in all files, not just in the first found with a match
     [rcconf, rcconf_local, rcconf_dir + "/#{service}"].each do |filename|
-      if Puppet::FileSystem::File.exist?(filename)
+      if Puppet::FileSystem.exist?(filename)
         s = File.read(filename)
         if s.gsub!(/^(#{rcvar}(_enable)?)=\"?(YES|NO)\"?/, "\\1=\"#{yesno}\"")
           File.open(filename, File::WRONLY) { |f| f << s }
@@ -87,14 +87,14 @@ Puppet::Type.type(:service).provide :freebsd, :parent => :init do
   def rc_add(service, rcvar, yesno)
     append = "\# Added by Puppet\n#{rcvar}_enable=\"#{yesno}\"\n"
     # First, try the one-file-per-service style
-    if Puppet::FileSystem::File.exist?(rcconf_dir)
+    if Puppet::FileSystem.exist?(rcconf_dir)
       File.open(rcconf_dir + "/#{service}", File::WRONLY | File::APPEND | File::CREAT, 0644) {
         |f| f << append
         self.debug("Appended to #{f.path}")
       }
     else
       # Else, check the local rc file first, but don't create it
-      if Puppet::FileSystem::File.exist?(rcconf_local)
+      if Puppet::FileSystem.exist?(rcconf_local)
         File.open(rcconf_local, File::WRONLY | File::APPEND) {
           |f| f << append
           self.debug("Appended to #{f.path}")

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

@@ -15,7 +15,7 @@ Puppet::Type.type(:service).provide :gentoo, :parent => :init do
   def disable
       output = update :del, @resource[:name], :default
   rescue Puppet::ExecutionFailure
-      raise Puppet::Error, "Could not disable #{self.name}: #{output}"
+      raise Puppet::Error, "Could not disable #{self.name}: #{output}", $!.backtrace
   end
 
   def enabled?
@@ -40,6 +40,6 @@ Puppet::Type.type(:service).provide :gentoo, :parent => :init do
   def enable
       output = update :add, @resource[:name], :default
   rescue Puppet::ExecutionFailure
-      raise Puppet::Error, "Could not enable #{self.name}: #{output}"
+      raise Puppet::Error, "Could not enable #{self.name}: #{output}", $!.backtrace
   end
 end

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

@@ -99,7 +99,7 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
       if File.directory?(path)
         true
       else
-        if Puppet::FileSystem::File.exist?(path)
+        if Puppet::FileSystem.exist?(path)
           self.debug "Search path #{path} is not a directory"
         else
           self.debug "Search path #{path} does not exist"
@@ -112,7 +112,7 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
   def search(name)
     paths.each do |path|
       fqname = File.join(path,name)
-      if Puppet::FileSystem::File.exist? fqname
+      if Puppet::FileSystem.exist? fqname
         return fqname
       else
         self.debug("Could not find #{name} in #{path}")
@@ -121,7 +121,7 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
 
     paths.each do |path|
       fqname_sh = File.join(path,"#{name}.sh")
-      if Puppet::FileSystem::File.exist? fqname_sh
+      if Puppet::FileSystem.exist? fqname_sh
         return fqname_sh
       else
         self.debug("Could not find #{name}.sh in #{path}")
@@ -154,8 +154,8 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
 private
 
   def self.is_init?(script = initscript)
-    file = Puppet::FileSystem::File.new(script)
-    !file.symlink? || file.readlink != "/lib/init/upstart-job"
+    file = Puppet::FileSystem.pathname(script)
+    !Puppet::FileSystem.symlink?(file) || Puppet::FileSystem.readlink(file) != "/lib/init/upstart-job"
   end
 end
 

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

@@ -171,7 +171,7 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
         @job_list[line.split(/\s/).last] = :running
       end
     rescue Puppet::ExecutionFailure
-      raise Puppet::Error.new("Unable to determine status of #{resource[:name]}")
+      raise Puppet::Error.new("Unable to determine status of #{resource[:name]}", $!)
     end
     @job_list
   end
@@ -222,7 +222,7 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
       @macosx_version_major = product_version_major
       return @macosx_version_major
     rescue Puppet::ExecutionFailure => detail
-      fail("Could not determine OS X version: #{detail}")
+      self.fail Puppet::Error, "Could not determine OS X version: #{detail}", detail
     end
   end
 
@@ -257,7 +257,7 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
     begin
       execute(cmds)
     rescue Puppet::ExecutionFailure
-      raise Puppet::Error.new("Unable to start service: #{resource[:name]} at path: #{job_path}")
+      raise Puppet::Error.new("Unable to start service: #{resource[:name]} at path: #{job_path}", $!)
     end
     # As load -w clears the Disabled flag, we need to add it in after
     self.disable if did_enable_job and resource[:enable] == :false
@@ -278,7 +278,7 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
     begin
       execute(cmds)
     rescue Puppet::ExecutionFailure
-      raise Puppet::Error.new("Unable to stop service: #{resource[:name]} at path: #{job_path}")
+      raise Puppet::Error.new("Unable to stop service: #{resource[:name]} at path: #{job_path}", $!)
     end
     # As unload -w sets the Disabled flag, we need to add it in after
     self.enable if did_disable_job and resource[:enable] == :true

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

@@ -17,7 +17,7 @@ Puppet::Type.type(:service).provide :redhat, :parent => :init, :source => :init
     # service in run levels 0, 1 and/or 6
     output = chkconfig("--level", "0123456", @resource[:name], :off)
   rescue Puppet::ExecutionFailure
-    raise Puppet::Error, "Could not disable #{self.name}: #{output}"
+    raise Puppet::Error, "Could not disable #{self.name}: #{output}", $!.backtrace
   end
 
   def enabled?
@@ -38,7 +38,7 @@ Puppet::Type.type(:service).provide :redhat, :parent => :init, :source => :init
   def enable
       chkconfig(@resource[:name], :on)
   rescue Puppet::ExecutionFailure => detail
-    raise Puppet::Error, "Could not enable #{self.name}: #{detail}"
+    raise Puppet::Error, "Could not enable #{self.name}: #{detail}", detail.backtrace
   end
 
   def initscript

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

@@ -42,7 +42,7 @@ Puppet::Type.type(:service).provide :runit, :parent => :daemontools do
     def defpath(dummy_argument=:work_arround_for_ruby_GC_bug)
       unless @defpath
         ["/etc/sv", "/var/lib/service"].each do |path|
-          if Puppet::FileSystem::File.exist?(path)
+          if Puppet::FileSystem.exist?(path)
             @defpath = path
             break
           end
@@ -57,7 +57,7 @@ Puppet::Type.type(:service).provide :runit, :parent => :daemontools do
   def servicedir
     unless @servicedir
       ["/service", "/etc/service","/var/service"].each do |path|
-        if Puppet::FileSystem::File.exist?(path)
+        if Puppet::FileSystem.exist?(path)
           @servicedir = path
           break
         end
@@ -73,7 +73,7 @@ Puppet::Type.type(:service).provide :runit, :parent => :daemontools do
       return :running if output =~ /^run: /
     rescue Puppet::ExecutionFailure => detail
       unless detail.message =~ /(warning: |runsv not running$)/
-        raise Puppet::Error.new( "Could not get status for service #{resource.ref}: #{detail}" )
+        raise Puppet::Error.new( "Could not get status for service #{resource.ref}: #{detail}", detail )
       end
     end
     :stopped
@@ -105,7 +105,7 @@ Puppet::Type.type(:service).provide :runit, :parent => :daemontools do
   # before a disable
   def disable
     # unlink the daemon symlink to disable it
-    Puppet::FileSystem::File.unlink(self.service) if Puppet::FileSystem::File.new(self.service).symlink?
+    Puppet::FileSystem.unlink(self.service) if Puppet::FileSystem.symlink?(self.service)
   end
 end
 

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

@@ -20,12 +20,11 @@ Puppet::Type.type(:service).provide :service do
   end
 
   # A simple wrapper so execution failures are a bit more informative.
-  def texecute(type, command, fof = true)
+  def texecute(type, command, fof = true, squelch = false, combine = true)
     begin
-      # #565: Services generally produce no output, so squelch them.
-      execute(command, :failonfail => fof, :override_locale => false, :squelch => true)
+      execute(command, :failonfail => fof, :override_locale => false, :squelch => squelch, :combine => combine)
     rescue Puppet::ExecutionFailure => detail
-      @resource.fail "Could not #{type} #{@resource.ref}: #{detail}"
+      @resource.fail Puppet::Error, "Could not #{type} #{@resource.ref}: #{detail}", detail
     end
     nil
   end

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

@@ -28,7 +28,7 @@ Puppet::Type.type(:service).provide :smf, :parent => :base do
         end
       end
   rescue Puppet::ExecutionFailure => detail
-      raise Puppet::Error.new( "Cannot config #{self.name} to enable it: #{detail}" )
+      raise Puppet::Error.new( "Cannot config #{self.name} to enable it: #{detail}", detail )
   end
 
   def self.instances

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

@@ -87,12 +87,12 @@ Puppet::Type.type(:service).provide :src, :parent => :base do
           end
           return :true
         rescue Puppet::ExecutionFailure => detail
-          raise Puppet::Error.new("Unable to restart service #{@resource[:name]}, error was: #{detail}" )
+          raise Puppet::Error.new("Unable to restart service #{@resource[:name]}, error was: #{detail}", detail )
         end
       end
       self.fail("No such service found")
   rescue Puppet::ExecutionFailure => detail
-      raise Puppet::Error.new("Cannot get status of #{@resource[:name]}, error was: #{detail}" )
+      raise Puppet::Error.new("Cannot get status of #{@resource[:name]}, error was: #{detail}", detail )
   end
 
   def status
@@ -113,7 +113,7 @@ Puppet::Type.type(:service).provide :src, :parent => :base do
       end
       self.fail("No such service found")
   rescue Puppet::ExecutionFailure => detail
-      raise Puppet::Error.new("Cannot get status of #{@resource[:name]}, error was: #{detail}" )
+      raise Puppet::Error.new("Cannot get status of #{@resource[:name]}, error was: #{detail}", detail )
   end
 
 end

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

@@ -5,12 +5,12 @@ Puppet::Type.type(:service).provide :systemd, :parent => :base do
 
   commands :systemctl => "systemctl"
 
-  #defaultfor :osfamily => [:redhat, :suse]
   defaultfor :osfamily => [:archlinux]
+  defaultfor :osfamily => :redhat, :operatingsystemmajrelease => "7"
 
   def self.instances
     i = []
-    output = systemctl('list-units', '--full', '--all',  '--no-pager')
+    output = systemctl('list-units', '--type', 'service', '--full', '--all',  '--no-pager')
     output.scan(/^(\S+)\s+(loaded|error)\s+(active|inactive)\s+(active|waiting|running|plugged|mounted|dead|exited|listening|elapsed)\s*?(\S.*?)?$/i).each do |m|
       i << new(:name => m[0])
     end
@@ -22,7 +22,7 @@ Puppet::Type.type(:service).provide :systemd, :parent => :base do
   def disable
     output = systemctl(:disable, @resource[:name])
   rescue Puppet::ExecutionFailure
-    raise Puppet::Error, "Could not disable #{self.name}: #{output}"
+    raise Puppet::Error, "Could not disable #{self.name}: #{output}", $!.backtrace
   end
 
   def enabled?
@@ -47,7 +47,7 @@ Puppet::Type.type(:service).provide :systemd, :parent => :base do
   def enable
     output = systemctl("enable", @resource[:name])
   rescue Puppet::ExecutionFailure
-    raise Puppet::Error, "Could not enable #{self.name}: #{output}"
+    raise Puppet::Error, "Could not enable #{self.name}: #{output}", $!.backtrace
   end
 
   def restartcmd

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

@@ -7,11 +7,14 @@ Puppet::Type.type(:service).provide :upstart, :parent => :debian do
 
   desc "Ubuntu service management with `upstart`.
 
-  This provider manages `upstart` jobs, which have replaced `initd` services
-  on Ubuntu. For `upstart` documentation, see <http://upstart.ubuntu.com/>.
+  This provider manages `upstart` jobs on Ubuntu. For `upstart` documentation,
+  see <http://upstart.ubuntu.com/>.
   "
-  # confine to :ubuntu for now because I haven't tested on other platforms
-  confine :operatingsystem => :ubuntu #[:ubuntu, :fedora, :debian]
+
+  confine :any => [
+    Facter.value(:operatingsystem) == 'Ubuntu',
+    (Facter.value(:osfamily) == 'RedHat' and Facter.value(:operatingsystemrelease) =~ /^6\./),
+  ]
 
   defaultfor :operatingsystem => :ubuntu
 
@@ -29,6 +32,18 @@ Puppet::Type.type(:service).provide :upstart, :parent => :debian do
     self.get_services(self.excludes) # Take exclude list from init provider
   end
 
+  def self.excludes
+    excludes = super
+    if Facter.value(:osfamily) == 'RedHat'
+      # Puppet cannot deal with services that have instances, so we have to
+      # ignore these services using instances on redhat based systems.
+      excludes += %w[serial tty]
+    end
+
+    excludes
+  end
+
+
   def self.get_services(exclude=[])
     instances = []
     execpipe("#{command(:initctl)} list") { |process|
@@ -71,7 +86,7 @@ Puppet::Type.type(:service).provide :upstart, :parent => :debian do
       paths.each do |path|
         service_name = name.match(/^(\S+)/)[1]
         fqname = File.join(path, service_name + suffix)
-        if Puppet::FileSystem::File.exist?(fqname)
+        if Puppet::FileSystem.exist?(fqname)
           return fqname
         end
 
@@ -148,7 +163,7 @@ Puppet::Type.type(:service).provide :upstart, :parent => :debian do
 
 private
   def is_upstart?(script = initscript)
-    Puppet::FileSystem::File.exist?(script) && script.match(/\/etc\/init\/\S+\.conf/)
+    Puppet::FileSystem.exist?(script) && script.match(/\/etc\/init\/\S+\.conf/)
   end
 
   def version_is_pre_0_6_7
@@ -256,7 +271,7 @@ private
   end
 
   def read_override_file
-    if Puppet::FileSystem::File.exist?(overscript)
+    if Puppet::FileSystem.exist?(overscript)
       read_script_from(overscript)
     else
       ""

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

@@ -22,21 +22,21 @@ Puppet::Type.type(:service).provide :windows, :parent => :service do
     w32ss = Win32::Service.configure( 'service_name' => @resource[:name], 'start_type' => Win32::Service::SERVICE_AUTO_START )
     raise Puppet::Error.new("Win32 service enable of #{@resource[:name]} failed" ) if( w32ss.nil? )
   rescue Win32::Service::Error => detail
-    raise Puppet::Error.new("Cannot enable #{@resource[:name]}, error was: #{detail}" )
+    raise Puppet::Error.new("Cannot enable #{@resource[:name]}, error was: #{detail}", detail )
   end
 
   def disable
     w32ss = Win32::Service.configure( 'service_name' => @resource[:name], 'start_type' => Win32::Service::SERVICE_DISABLED )
     raise Puppet::Error.new("Win32 service disable of #{@resource[:name]} failed" ) if( w32ss.nil? )
   rescue Win32::Service::Error => detail
-    raise Puppet::Error.new("Cannot disable #{@resource[:name]}, error was: #{detail}" )
+    raise Puppet::Error.new("Cannot disable #{@resource[:name]}, error was: #{detail}", detail )
   end
 
   def manual_start
     w32ss = Win32::Service.configure( 'service_name' => @resource[:name], 'start_type' => Win32::Service::SERVICE_DEMAND_START )
     raise Puppet::Error.new("Win32 service manual enable of #{@resource[:name]} failed" ) if( w32ss.nil? )
   rescue Win32::Service::Error => detail
-    raise Puppet::Error.new("Cannot enable #{@resource[:name]} for manual start, error was: #{detail}" )
+    raise Puppet::Error.new("Cannot enable #{@resource[:name]} for manual start, error was: #{detail}", detail )
   end
 
   def enabled?
@@ -56,7 +56,7 @@ Puppet::Type.type(:service).provide :windows, :parent => :service do
         raise Puppet::Error.new("Unknown start type: #{w32ss.start_type}")
     end
   rescue Win32::Service::Error => detail
-    raise Puppet::Error.new("Cannot get start type for #{@resource[:name]}, error was: #{detail}" )
+    raise Puppet::Error.new("Cannot get start type for #{@resource[:name]}, error was: #{detail}", detail )
   end
 
   def start
@@ -75,13 +75,13 @@ Puppet::Type.type(:service).provide :windows, :parent => :service do
 
     net(:start, @resource[:name])
   rescue Puppet::ExecutionFailure => detail
-    raise Puppet::Error.new("Cannot start #{@resource[:name]}, error was: #{detail}" )
+    raise Puppet::Error.new("Cannot start #{@resource[:name]}, error was: #{detail}", detail )
   end
 
   def stop
     net(:stop, @resource[:name])
   rescue Puppet::ExecutionFailure => detail
-    raise Puppet::Error.new("Cannot stop #{@resource[:name]}, error was: #{detail}" )
+    raise Puppet::Error.new("Cannot stop #{@resource[:name]}, error was: #{detail}", detail )
   end
 
   def status
@@ -96,7 +96,7 @@ Puppet::Type.type(:service).provide :windows, :parent => :service do
     debug("Service #{@resource[:name]} is #{w32ss.current_state}")
     return state
   rescue Win32::Service::Error => detail
-    raise Puppet::Error.new("Cannot get status of #{@resource[:name]}, error was: #{detail}" )
+    raise Puppet::Error.new("Cannot get status of #{@resource[:name]}, error was: #{detail}", detail )
   end
 
   # returns all providers for all existing services and startup state