puppet 3.2.4 → 3.3.0.rc2

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

@@ -74,7 +74,7 @@ Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do
       end
     end
 
-    output = yum "-d", "0", "-e", "0", "-y", operation, wanted
+    yum "-d", "0", "-e", "0", "-y", operation, wanted
 
     is = self.query
     raise Puppet::Error, "Could not find package #{self.name}" unless is

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

@@ -1,7 +1,7 @@
 Puppet::Type.type(:package).provide :zypper, :parent => :rpm do
   desc "Support for SuSE `zypper` package manager. Found in SLES10sp2+ and SLES11"
 
-  has_feature :versionable
+  has_feature :versionable, :install_options
 
   commands :zypper => "/usr/bin/zypper"
 
@@ -51,9 +51,9 @@ Puppet::Type.type(:package).provide :zypper, :parent => :rpm do
 
     #zypper 0.6.13 (OpenSuSE 10.2) does not support auto agree with licenses
     if major < 1 and minor <= 6 and patch <= 13
-      zypper quiet, :install, noconfirm, wanted
+      zypper quiet, :install, noconfirm, install_options, wanted
     else
-      zypper quiet, :install, license, noconfirm, wanted
+      zypper quiet, :install, license, noconfirm, install_options, wanted
     end
 
     unless self.query
@@ -81,4 +81,23 @@ Puppet::Type.type(:package).provide :zypper, :parent => :rpm do
     # zypper install can be used for update, too
     self.install
   end
+
+  def install_options
+    join_options(resource[:install_options])
+  end
+
+  def join_options(options)
+    return unless options
+
+    options.collect do |val|
+      case val
+      when Hash
+        val.keys.sort.collect do |k|
+          "#{k} '#{val[k]}'"
+        end.join(' ')
+      else
+        val
+      end
+    end
+  end
 end

data/lib/puppet/provider/parsedfile.rb

@@ -160,15 +160,6 @@ class Puppet::Provider::ParsedFile < Puppet::Provider
     [resource_type.validproperties, resource_type.parameters].flatten.each do |attr|
       attr = attr.intern
       define_method(attr) do
-#                if @property_hash.empty?
-#                    # Note that this swaps the provider out from under us.
-#                    prefetch
-#                    if @resource.provider == self
-#                        return @property_hash[attr]
-#                    else
-#                        return @resource.provider.send(attr)
-#                    end
-#                end
         # If it's not a valid field for this record type (which can happen
         # when different platforms support different fields), then just
         # return the should value, so the resource shuts up.
@@ -416,8 +407,6 @@ class Puppet::Provider::ParsedFile < Puppet::Provider
     end
 
     self.class.flush(@property_hash)
-
-    #@property_hash = {}
   end
 
   def initialize(record)
@@ -425,7 +414,7 @@ class Puppet::Provider::ParsedFile < Puppet::Provider
 
     # The 'record' could be a resource or a record, depending on how the provider
     # is initialized.  If we got an empty property hash (probably because the resource
-    # is just being initialized), then we want to set up some defualts.
+    # is just being initialized), then we want to set up some defaults.
     @property_hash = self.class.record?(resource[:name]) || {:record_type => self.class.name, :ensure => :absent} if @property_hash.empty?
   end
 

data/lib/puppet/provider/scheduled_task/win32_taskscheduler.rb

@@ -74,7 +74,7 @@ Puppet::Type.type(:scheduled_task).provide(:win32_taskscheduler) do
     task.trigger_count.times do |i|
       trigger = begin
                   task.trigger(i)
-                rescue Win32::TaskScheduler::Error => e
+                rescue Win32::TaskScheduler::Error
                   # Win32::TaskScheduler can't handle all of the
                   # trigger types Windows uses, so we need to skip the
                   # unhandled types to prevent "puppet resource" from

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

@@ -92,7 +92,7 @@ Puppet::Type.type(:service).provide :base, :parent => :service do
       end
       begin
         output = kill pid
-      rescue Puppet::ExecutionFailure => detail
+      rescue Puppet::ExecutionFailure
         @resource.fail "Could not kill #{self.name}, PID #{pid}: #{output}"
       end
       return true

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

@@ -129,7 +129,7 @@ Puppet::Type.type(:service).provide :daemontools, :parent => :base do
         Puppet.notice "Configuring #{resource[:name]}"
         command = [ resource[:manifest], resource[:name] ]
         #texecute("setupservice", command)
-        rv = system("#{command}")
+        system("#{command}")
       end
   rescue Puppet::ExecutionFailure => detail
       raise Puppet::Error.new( "Cannot config #{self.service} to enable it: #{detail}" )
@@ -157,7 +157,7 @@ Puppet::Type.type(:service).provide :daemontools, :parent => :base do
           File.symlink(self.daemon, self.service)
         end
       end
-  rescue Puppet::ExecutionFailure => detail
+  rescue Puppet::ExecutionFailure
       raise Puppet::Error.new( "No daemon directory found for #{self.service}")
   end
 
@@ -173,7 +173,7 @@ Puppet::Type.type(:service).provide :daemontools, :parent => :base do
           File.unlink(self.service)
         end
       end
-    rescue Puppet::ExecutionFailure => detail
+    rescue Puppet::ExecutionFailure
       raise Puppet::Error.new( "No daemon directory found for #{self.service}")
     end
     self.stop

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

@@ -54,7 +54,7 @@ Puppet::Type.type(:service).provide :debian, :parent => :init do
   end
 
   def get_start_link_count
-    Dir.glob("/etc/rc*.d/S*#{@resource[:name]}").length
+    Dir.glob("/etc/rc*.d/S??#{@resource[:name]}").length
   end
 
   def enable

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

@@ -43,6 +43,10 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
     excludes += %w{wait-for-state portmap-wait}
     # these excludes were found with grep -r -L start /etc/init.d
     excludes += %w{rcS module-init-tools}
+    # Prevent puppet failing to get status of the new service introduced
+    # by the fix for this (bug https://bugs.launchpad.net/ubuntu/+source/lightdm/+bug/982889)
+    # due to puppet's inability to deal with upstart services with instances.
+    excludes += %w{plymouth-ready}
   end
 
   # List all services of this type.
@@ -106,33 +110,23 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
   end
 
   def search(name)
-    paths.each { |path|
+    paths.each do |path|
       fqname = File.join(path,name)
-      begin
-        stat = File.stat(fqname)
-      rescue
-        # should probably rescue specific errors...
+      if File.exist? fqname
+        return fqname
+      else
         self.debug("Could not find #{name} in #{path}")
-        next
       end
+    end
 
-      # if we've gotten this far, we found a valid script
-      return fqname
-    }
-
-    paths.each { |path|
+    paths.each do |path|
       fqname_sh = File.join(path,"#{name}.sh")
-      begin
-        stat = File.stat(fqname_sh)
-      rescue
-        # should probably rescue specific errors...
+      if File.exist? fqname_sh
+        return fqname_sh
+      else
         self.debug("Could not find #{name}.sh in #{path}")
-        next
       end
-
-      # if we've gotten this far, we found a valid script
-      return fqname_sh
-    }
+    end
     raise Puppet::Error, "Could not find init script for '#{name}'"
   end
 

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

@@ -10,8 +10,10 @@ Puppet::Type.type(:service).provide :openrc, :parent => :base do
   defaultfor :operatingsystem => :gentoo
   defaultfor :operatingsystem => :funtoo
 
+  has_command(:rcstatus, '/bin/rc-status') do
+    environment :RC_SVCNAME => nil
+  end
   commands :rcservice => '/sbin/rc-service'
-  commands :rcstatus  => '/bin/rc-status'
   commands :rcupdate  => '/sbin/rc-update'
 
   self::STATUSLINE = /^\s+(.*?)\s*\[\s*(.*)\s*\]$/

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

@@ -21,25 +21,22 @@ Puppet::Type.type(:service).provide :redhat, :parent => :init, :source => :init
   end
 
   def enabled?
+    # Checkconfig always returns 0 on SuSE unless the --check flag is used.
+    args = (Facter.value(:osfamily) == 'Suse' ? ['--check'] : [])
+
     begin
-      output = chkconfig(@resource[:name])
+      chkconfig(@resource[:name], *args)
     rescue Puppet::ExecutionFailure
       return :false
     end
 
-    # If it's disabled on SuSE, then it will print output showing "off"
-    # at the end
-    if output =~ /.* off$/
-      return :false
-    end
-
     :true
   end
 
   # Don't support them specifying runlevels; always use the runlevels
   # in the init scripts.
   def enable
-      output = chkconfig(@resource[:name], :on)
+      chkconfig(@resource[:name], :on)
   rescue Puppet::ExecutionFailure => detail
     raise Puppet::Error, "Could not enable #{self.name}: #{detail}"
   end

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

@@ -9,12 +9,13 @@ Puppet::Type.type(:service).provide :runit, :parent => :daemontools do
     When detecting the service directory it will check, in order of preference:
 
     * `/service`
-    * `/var/service`
     * `/etc/service`
+    * `/var/service`
 
     The daemon directory should be in one of the following locations:
 
     * `/etc/sv`
+    * `/var/lib/service`
 
     or this can be overriden in the service resource parameters::
 
@@ -46,7 +47,7 @@ Puppet::Type.type(:service).provide :runit, :parent => :daemontools do
             break
           end
         end
-        raise "Could not find the daemon directory (tested [/var/lib/service,/etc])" unless @defpath
+        raise "Could not find the daemon directory (tested [/etc/sv,/var/lib/service])" unless @defpath
       end
       @defpath
     end

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

@@ -37,7 +37,7 @@ Puppet::Type.type(:service).provide :systemd, :parent => :base do
 
   def status
     begin
-      output = systemctl("is-active", @resource[:name])
+      systemctl("is-active", @resource[:name])
     rescue Puppet::ExecutionFailure
       return :stopped
     end

data/lib/puppet/provider/ssh_authorized_key/parsed.rb

@@ -47,7 +47,7 @@ Puppet::Type.type(:ssh_authorized_key).provide(
 
   def flush
     raise Puppet::Error, "Cannot write SSH authorized keys without user"    unless @resource.should(:user)
-    raise Puppet::Error, "User '#{@resource.should(:user)}' does not exist" unless uid = Puppet::Util.uid(@resource.should(:user))
+    raise Puppet::Error, "User '#{@resource.should(:user)}' does not exist" unless Puppet::Util.uid(@resource.should(:user))
     # ParsedFile usually calls backup_target much later in the flush process,
     # but our SUID makes that fail to open filebucket files for writing.
     # Fortunately, there's already logic to make sure it only ever happens once,

data/lib/puppet/provider/sshkey/parsed.rb

@@ -27,8 +27,6 @@ Puppet::Type.type(:sshkey).provide(
     },
     :pre_gen => proc { |hash|
       if hash[:host_aliases]
-        names = [hash[:name], hash[:host_aliases]].flatten
-
         hash[:name] = [hash[:name], hash[:host_aliases]].flatten.join(",")
         hash.delete(:host_aliases)
       end

data/lib/puppet/provider/user/aix.rb

@@ -38,7 +38,7 @@ Puppet::Type.type(:user).provide :aix, :parent => Puppet::Provider::AixObject do
   has_features :manages_expiry,  :manages_password_age
 
   # Attribute verification (TODO)
-  #verify :gid, "GID must be an string or int of a valid group" do |value|
+  #verify :gid, "GID must be a string or int of a valid group" do |value|
   #  value.is_a? String || value.is_a? Integer
   #end
   #
@@ -48,7 +48,7 @@ Puppet::Type.type(:user).provide :aix, :parent => Puppet::Provider::AixObject do
 
   # User attributes to ignore from AIX output.
   def self.attribute_ignore
-    []
+    ["name"]
   end
 
   # AIX attributes to properties mapping.
@@ -60,19 +60,20 @@ Puppet::Type.type(:user).provide :aix, :parent => Puppet::Provider::AixObject do
   #  :to            Method to adapt puppet property to aix command value. Optional.
   #  :from          Method to adapt aix command value to puppet property. Optional
   self.attribute_mapping = [
-    #:name => :name,
     {:aix_attr => :pgrp,       :puppet_prop => :gid,
-        :to => :gid_to_attr, :from => :gid_from_attr},
+                                :to => :gid_to_attr,
+                                :from => :gid_from_attr },
     {:aix_attr => :id,         :puppet_prop => :uid},
     {:aix_attr => :groups,     :puppet_prop => :groups},
     {:aix_attr => :home,       :puppet_prop => :home},
     {:aix_attr => :shell,      :puppet_prop => :shell},
     {:aix_attr => :expires,    :puppet_prop => :expiry,
-        :to => :expiry_to_attr, :from => :expiry_from_attr},
+                                :to => :expiry_to_attr,
+                                :from => :expiry_from_attr },
     {:aix_attr => :maxage,     :puppet_prop => :password_max_age},
     {:aix_attr => :minage,     :puppet_prop => :password_min_age},
     {:aix_attr => :attributes, :puppet_prop => :attributes},
-    {:aix_attr => :gecos,      :puppet_prop => :comment},
+    { :aix_attr => :gecos,      :puppet_prop => :comment },
   ]
 
   #--------------
@@ -140,7 +141,7 @@ Puppet::Type.type(:user).provide :aix, :parent => Puppet::Provider::AixObject do
     if key == :attributes
       raise Puppet::Error, "Attributes must be a list of pairs key=value on #{@resource.class.name}[#{@resource.name}]" \
         unless value and value.is_a? Hash
-      return value.select { |k,v| true }.map { |pair| pair.join("=") }
+      return value.map { |k,v| k.to_s.strip + "=" + v.to_s.strip}
     end
 
     super(key, value, mapping, objectinfo)
@@ -271,18 +272,30 @@ Puppet::Type.type(:user).provide :aix, :parent => Puppet::Provider::AixObject do
     end
   end
 
+  def managed_attribute_keys(hash)
+    managed_attributes ||= @resource.original_parameters[:attributes] || hash.keys.map{|k| k.to_s}
+    managed_attributes.map {|attr| key, value = attr.split("="); key.strip.to_sym}
+  end
+
+  def should_include?(key, managed_keys)
+    !self.class.attribute_mapping_from.include?(key) and
+            !self.class.attribute_ignore.include?(key) and
+            managed_keys.include?(key)
+  end
+
   def filter_attributes(hash)
-    # Return only not managed attributtes.
-    hash.select {
-        |k,v| !self.class.attribute_mapping_from.include?(k) and
-                !self.class.attribute_ignore.include?(k)
+    # Return only managed attributtes.
+    managed_keys = managed_attribute_keys(hash)
+    results = hash.select {
+        |k,v| should_include?(k, managed_keys)
       }.inject({}) {
         |hash, array| hash[array[0]] = array[1]; hash
       }
+    results
   end
 
   def attributes
-    filter_attributes(getosinfo(refresh = false))
+    filter_attributes(getosinfo(false))
   end
 
   def attributes=(attr_hash)

data/lib/puppet/provider/user/directoryservice.rb

@@ -188,7 +188,7 @@ Puppet::Type.type(:user).provide :directoryservice do
   def self.convert_xml_to_binary(plist_data)
     Puppet.debug('Converting XML plist to binary')
     Puppet.debug('Executing: \'plutil -convert binary1 -o - -\'')
-    IO.popen('plutil -convert binary1 -o - -', mode='r+') do |io|
+    IO.popen('plutil -convert binary1 -o - -', 'r+') do |io|
       io.write Plist::Emit.dump(plist_data)
       io.close_write
       @converted_plist = io.read
@@ -201,7 +201,7 @@ Puppet::Type.type(:user).provide :directoryservice do
   def self.convert_binary_to_xml(plist_data)
     Puppet.debug('Converting binary plist to XML')
     Puppet.debug('Executing: \'plutil -convert xml1 -o - -\'')
-    IO.popen('plutil -convert xml1 -o - -', mode='r+') do |io|
+    IO.popen('plutil -convert xml1 -o - -', 'r+') do |io|
       io.write plist_data
       io.close_write
       @converted_plist = io.read
@@ -297,11 +297,8 @@ Puppet::Type.type(:user).provide :directoryservice do
                 end
       end
 
-      # If a non-numerical gid value is passed, assume it is a group name and
-      # lookup that group's GID value to use when setting the GID
-      if (attribute == :gid) and value.class == 'Fixnum'
-        value = self.class.get_attribute_from_dscl('Groups', value, 'PrimaryGroupID')['dsAttrTypeStandard:PrimaryGroupID'][0]
-      end
+      # Ensure group names are converted to integers.
+      value = Puppet::Util.gid(value) if attribute == :gid
 
       ## Set values ##
       # For the :password and :groups properties, call the setter methods

data/lib/puppet/provider/user/ldap.rb

@@ -27,7 +27,6 @@ Puppet::Type.type(:user).provide :ldap, :parent => Puppet::Provider::Ldap do
   # Use the last field of a space-separated array as
   # the sn.  LDAP requires a surname, for some stupid reason.
   manager.generates(:sn).from(:cn).with do |cn|
-    x = 1
     cn[0].split(/\s+/)[-1]
   end
 

data/lib/puppet/provider/user/user_role_add.rb

@@ -1,5 +1,6 @@
 require 'puppet/util'
 require 'puppet/util/user_attr'
+require 'date'
 
 Puppet::Type.type(:user).provide :user_role_add, :parent => :useradd, :source => :useradd do
 
@@ -195,6 +196,7 @@ Puppet::Type.type(:user).provide :user_role_add, :parent => :useradd, :source =>
           line_arr = line.split(':')
           if line_arr[0] == @resource[:name]
             line_arr[1] = cryptopw
+            line_arr[2] = (Date.today - Date.new(1970,1,1)).to_i.to_s
             line = line_arr.join(':')
           end
           fh.print line

data/lib/puppet/provider/user/useradd.rb

@@ -71,7 +71,7 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
   end
 
   def local_username
-    user = finduser('uid', @resource.uid)
+    finduser('uid', @resource.uid)
   end
 
   def localuid