puppet 3.1.1 → 3.2.0.rc1

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

@@ -10,15 +10,6 @@ Puppet::Type.type(:service).provide :redhat, :parent => :init, :source => :init
 
   defaultfor :osfamily => [:redhat, :suse]
 
-  def self.instances
-    # this exclude list is all from /sbin/service (5.x), but I did not exclude kudzu
-    self.get_services(['/etc/init.d'], ['functions', 'halt', 'killall', 'single', 'linuxconf', 'reboot', 'boot'])
-  end
-
-  def self.defpath
-    superclass.defpath
-  end
-
   # Remove the symlinks
   def disable
     # The off method operates on run levels 2,3,4 and 5 by default We ensure

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

@@ -14,13 +14,26 @@ Puppet::Type.type(:service).provide :src, :parent => :base do
   defaultfor :operatingsystem => :aix
   confine :operatingsystem => :aix
 
-  commands :stopsrc  => "/usr/bin/stopsrc"
-  commands :startsrc => "/usr/bin/startsrc"
-  commands :refresh  => "/usr/bin/refresh"
-  commands :lssrc    => "/usr/bin/lssrc"
+  optional_commands :stopsrc  => "/usr/bin/stopsrc",
+                    :startsrc => "/usr/bin/startsrc",
+                    :refresh  => "/usr/bin/refresh",
+                    :lssrc    => "/usr/bin/lssrc",
+                    :lsitab   => "/usr/sbin/lsitab",
+                    :mkitab   => "/usr/sbin/mkitab",
+                    :rmitab   => "/usr/sbin/rmitab",
+                    :chitab   => "/usr/sbin/chitab"
 
   has_feature :refreshable
 
+  def self.instances
+    services = lssrc('-S')
+    services.split("\n").reject { |x| x.strip.start_with? '#' }.collect do |line|
+      data = line.split(':')
+      service_name = data[0]
+      new(:name => service_name)
+    end
+  end
+
   def startcmd
     [command(:startsrc), "-s", @resource[:name]]
   end
@@ -29,6 +42,27 @@ Puppet::Type.type(:service).provide :src, :parent => :base do
     [command(:stopsrc), "-s", @resource[:name]]
   end
 
+  def default_runlevel
+    "2"
+  end
+
+  def default_action
+    "once"
+  end
+
+  def enabled?
+    execute([command(:lsitab), @resource[:name]], {:failonfail => false, :combine => true})
+    $CHILD_STATUS.exitstatus == 0 ? :true : :false
+  end
+
+  def enable
+    mkitab("%s:%s:%s:%s" % [@resource[:name], default_runlevel, default_action, startcmd.join(" ")])
+  end
+
+  def disable
+    rmitab(@resource[:name])
+  end
+
   def restart
       execute([command(:lssrc), "-Ss", @resource[:name]]).each_line do |line|
         args = line.split(":")

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

@@ -1,9 +1,9 @@
 # Manage systemd services using /bin/systemctl
 
 Puppet::Type.type(:service).provide :systemd, :parent => :base do
-  desc "Manages `systemd` services using `/bin/systemctl`."
+  desc "Manages `systemd` services using `systemctl`."
 
-  commands :systemctl => "/bin/systemctl"
+  commands :systemctl => "systemctl"
 
   #defaultfor :osfamily => [:redhat, :suse]
 

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

@@ -25,15 +25,8 @@ Puppet::Type.type(:service).provide :upstart, :parent => :debian do
   # http://www.linuxplanet.com/linuxplanet/tutorials/7033/2/
   has_feature :enableable
 
-  # 'wait-for-state' is excluded from instances here because it takes
-  # parameters that have unclear meaning. It looks like 'wait-for-state' is
-  # mainly used internally for other upstart services as a 'sleep until something happens'
-  # (http://lists.debian.org/debian-devel/2012/02/msg01139.html). There is an open launchpad bug
-  # (https://bugs.launchpad.net/ubuntu/+source/upstart/+bug/962047) that may
-  # eventually explain how to use this service or perhaps why it should remain
-  # excluded. When that bug is adddressed this should be reexamined.
   def self.instances
-    self.get_services(['wait-for-state'])
+    self.get_services(self.excludes) # Take exclude list from init provider
   end
 
   def self.get_services(exclude=[])

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

@@ -72,6 +72,7 @@ Puppet::Type.type(:user).provide :aix, :parent => Puppet::Provider::AixObject do
     {: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},
   ]
 
   #--------------
@@ -94,7 +95,7 @@ Puppet::Type.type(:user).provide :aix, :parent => Puppet::Provider::AixObject do
   end
 
   def lscmd(value=@resource[:name])
-    [self.class.command(:list)] + self.get_ia_module_args + [ value]
+    [self.class.command(:list), "-c"] + self.get_ia_module_args + [ value]
   end
 
   def lsallcmd()
@@ -146,7 +147,7 @@ Puppet::Type.type(:user).provide :aix, :parent => Puppet::Provider::AixObject do
   end
 
   # Get the groupname from its id
-  def self.groupname_by_id(gid)
+  def groupname_by_id(gid)
     groupname=nil
     execute(lsgroupscmd("ALL")).each_line { |entry|
       attrs = self.parse_attr_list(entry, nil)
@@ -166,7 +167,7 @@ Puppet::Type.type(:user).provide :aix, :parent => Puppet::Provider::AixObject do
   # Check that a group exists and is valid
   def verify_group(value)
     if value.is_a? Integer or value.is_a? Fixnum
-      groupname = self.groupname_by_id(value)
+      groupname = groupname_by_id(value)
       raise ArgumentError, "AIX group must be a valid existing group" unless groupname
     else
       raise ArgumentError, "AIX group must be a valid existing group" unless groupid_by_name(value)
@@ -297,13 +298,6 @@ Puppet::Type.type(:user).provide :aix, :parent => Puppet::Provider::AixObject do
     end
   end
 
-  #- **comment**
-  #    A description of the user.  Generally is a user's full name.
-  #def comment=(value)
-  #end
-  #
-  #def comment
-  #end
   # UNSUPPORTED
   #- **profile_membership**
   #    Whether specified roles should be treated as the only roles

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

@@ -12,7 +12,11 @@ Puppet::Type.type(:user).provide :pw, :parent => Puppet::Provider::NameService::
   options :home, :flag => "-d", :method => :dir
   options :comment, :method => :gecos
   options :groups, :flag => "-G"
-  options :expiry, :method => :expire
+  options :expiry, :method => :expire, :munge => proc { |value|
+    value = '0000-00-00' if value == :absent
+    value.split("-").reverse.join("-")
+  }
+
 
   verify :gid, "GID must be an integer" do |value|
     value.is_a? Integer
@@ -26,21 +30,13 @@ Puppet::Type.type(:user).provide :pw, :parent => Puppet::Provider::NameService::
     cmd = [command(:pw), "useradd", @resource[:name]]
     @resource.class.validproperties.each do |property|
       next if property == :ensure or property == :password
-      # the value needs to be quoted, mostly because -c might
-      # have spaces in it
       if value = @resource.should(property) and value != ""
-        if property == :expiry
-          # FreeBSD uses DD-MM-YYYY rather than YYYY-MM-DD
-          value = value.split("-").reverse.join("-")
-        end
-        cmd << flag(property) << value
+        cmd << flag(property) << munge(property,value)
       end
     end
 
     cmd << "-o" if @resource.allowdupe?
-
     cmd << "-m" if @resource.managehome?
-
     cmd
   end
 

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

@@ -1,4 +1,8 @@
 require 'puppet/provider/nameservice/objectadd'
+require 'date'
+require 'puppet/util/libuser'
+require 'time'
+require 'puppet/error'
 
 Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameService::ObjectAdd do
   desc "User management via `useradd` and its ilk.  Note that you will need to
@@ -10,8 +14,71 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
   options :home, :flag => "-d", :method => :dir
   options :comment, :method => :gecos
   options :groups, :flag => "-G"
-  options :password_min_age, :flag => "-m"
-  options :password_max_age, :flag => "-M"
+  options :password_min_age, :flag => "-m", :method => :sp_min
+  options :password_max_age, :flag => "-M", :method => :sp_max
+  options :password, :method => :sp_pwdp
+  options :expiry, :method => :sp_expire,
+    :munge => proc { |value|
+      if value == :absent
+        ''
+      else
+        case Facter.value(:operatingsystem)
+        when 'Solaris'
+          # Solaris uses %m/%d/%Y for useradd/usermod
+          expiry_year, expiry_month, expiry_day = value.split('-')
+          [expiry_month, expiry_day, expiry_year].join('/')
+        else
+          value
+        end
+      end
+    },
+    :unmunge => proc { |value|
+      if value == -1
+        :absent
+      else
+        # Expiry is days after 1970-01-01
+        (Date.new(1970,1,1) + value).strftime('%Y-%m-%d')
+      end
+    }
+
+  optional_commands :localadd => "luseradd"
+  has_feature :libuser if Puppet.features.libuser?
+
+  def exists?
+    return !!localuid if @resource.forcelocal?
+    super
+  end
+
+  def uid
+     return localuid if @resource.forcelocal?
+     get(:uid)
+  end
+
+  def finduser(key, value)
+    passwd_file = "/etc/passwd"
+    passwd_keys = ['account', 'password', 'uid', 'gid', 'gecos', 'directory', 'shell']
+    index = passwd_keys.index(key)
+    File.open(passwd_file) do |f|
+      f.each_line do |line|
+         user = line.split(":")
+         if user[index] == value
+             f.close
+             return user
+         end
+      end
+    end
+    false
+  end
+
+  def local_username
+    user = finduser('uid', @resource.uid)
+  end
+
+  def localuid
+    user = finduser('account', resource[:name])
+    return user[2] if user
+    false
+  end
 
   verify :gid, "GID must be an integer" do |value|
     value.is_a? Integer
@@ -27,14 +94,25 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
   has_features :manages_passwords, :manages_password_age if Puppet.features.libshadow?
 
   def check_allow_dup
-    @resource.allowdupe? ? ["-o"] : []
+    # We have to manually check for duplicates when using libuser
+    # because by default duplicates are allowed.  This check is
+    # to ensure consistent behaviour of the useradd provider when
+    # using both useradd and luseradd
+    if not @resource.allowdupe? and @resource.forcelocal?
+       if @resource.should(:uid) and finduser('uid', @resource.should(:uid).to_s)
+           raise(Puppet::Error, "UID #{@resource.should(:uid).to_s} already exists, use allowdupe to force user creation")
+       end
+    elsif @resource.allowdupe? and not @resource.forcelocal?
+       return ["-o"]
+    end
+    []
   end
 
   def check_manage_home
     cmd = []
-    if @resource.managehome?
+    if @resource.managehome? and not @resource.forcelocal?
       cmd << "-m"
-    elsif Facter.value(:osfamily) == 'RedHat'
+    elsif not @resource.managehome? and Facter.value(:osfamily) == 'RedHat'
       cmd << "-M"
     end
     cmd
@@ -42,7 +120,7 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
 
   def check_manage_expiry
     cmd = []
-    if @resource[:expiry]
+    if @resource[:expiry] and not @resource.forcelocal?
       cmd << "-e #{@resource[:expiry]}"
     end
 
@@ -59,30 +137,52 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
 
   def add_properties
     cmd = []
-    Puppet::Type.type(:user).validproperties.each do |property|
+    # validproperties is a list of properties in undefined order
+    # sort them to have a predictable command line in tests
+    Puppet::Type.type(:user).validproperties.sort.each do |property|
       next if property == :ensure
       next if property.to_s =~ /password_.+_age/
+      next if property == :groups and @resource.forcelocal?
+      next if property == :expiry and @resource.forcelocal?
       # the value needs to be quoted, mostly because -c might
       # have spaces in it
       if value = @resource.should(property) and value != ""
-        cmd << flag(property) << value
+        cmd << flag(property) << munge(property, value)
       end
     end
     cmd
   end
 
   def addcmd
-    cmd = [command(:add)]
+    if @resource.forcelocal?
+      cmd = [command(:localadd)]
+      @custom_environment = Puppet::Util::Libuser.getenv
+    else
+      cmd = [command(:add)]
+    end
+    if not @resource.should(gid) and Puppet::Util.gid(@resource[:name])
+      cmd += ["-g", @resource[:name]]
+    end
     cmd += add_properties
     cmd += check_allow_dup
     cmd += check_manage_home
-    cmd += check_manage_expiry
     cmd += check_system_users
     cmd << @resource[:name]
   end
 
+  def modifycmd(param, value)
+    cmd = super(param, value)
+    cmd += check_manage_home if param == :home
+
+    cmd
+  end
+
   def deletecmd
-    cmd = [command(:delete)]
+    if @resource.forcelocal?
+       cmd = [command(:localdelete)]
+    else
+       cmd = [command(:delete)]
+    end
     cmd += @resource.managehome? ? ['-r'] : []
     cmd << @resource[:name]
   end
@@ -96,31 +196,29 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
     end
   end
 
-  def password_min_age
-    if Puppet.features.libshadow?
-      if ent = Shadow::Passwd.getspnam(@resource.name)
-        return ent.sp_min
+  [:expiry, :password_min_age, :password_max_age, :password].each do |shadow_property|
+    define_method(shadow_property) do
+      if Puppet.features.libshadow?
+        if ent = Shadow::Passwd.getspnam(@resource.name)
+          method = self.class.option(shadow_property, :method)
+          return unmunge(shadow_property, ent.send(method))
+        end
       end
+      :absent
     end
-    :absent
   end
 
-  def password_max_age
-    if Puppet.features.libshadow?
-      if ent = Shadow::Passwd.getspnam(@resource.name)
-        return ent.sp_max
-      end
-    end
-    :absent
+  def create
+     super
+     if @resource.forcelocal? and self.groups?
+       set(:groups, @resource[:groups])
+     end
+     if @resource.forcelocal? and @resource[:expiry]
+       set(:expiry, @resource[:expiry])
+     end
   end
 
-  # Retrieve the password using the Shadow Password library
-  def password
-    if Puppet.features.libshadow?
-      if ent = Shadow::Passwd.getspnam(@resource.name)
-        return ent.sp_pwdp
-      end
-    end
-    :absent
+  def groups?
+    !!@resource[:groups]
   end
 end

data/lib/puppet/provider/vlan/cisco.rb

@@ -8,8 +8,8 @@ Puppet::Type.type(:vlan).provide :cisco, :parent => Puppet::Provider::Cisco do
 
   def self.lookup(device, id)
     vlans = {}
-    device.command do |d|
-      vlans = d.parse_vlans || {}
+    device.command do |dev|
+      vlans = dev.parse_vlans || {}
     end
     vlans[id]
   end
@@ -20,8 +20,8 @@ Puppet::Type.type(:vlan).provide :cisco, :parent => Puppet::Provider::Cisco do
 
   # Clear out the cached values.
   def flush
-    device.command do |device|
-      device.update_vlan(resource[:name], former_properties, properties)
+    device.command do |dev|
+      dev.update_vlan(resource[:name], former_properties, properties)
     end
     super
   end

data/lib/puppet/reference/function.rb

@@ -8,8 +8,8 @@ performing stand-alone work like importing.  Rvalues return values and can
 only be used in a statement requiring a value, such as an assignment or a case
 statement.
 
-Functions execute on the Puppet master.  They do not execute on the Puppet agent.  
-Hence they only have access to the commands and data available on the Puppet master 
+Functions execute on the Puppet master.  They do not execute on the Puppet agent.
+Hence they only have access to the commands and data available on the Puppet master
 host.
 
 Here are the functions available in Puppet: