puppet 2.6.18 → 2.7.1

data/lib/puppet/type/interface.rb

@@ -0,0 +1,109 @@
+#
+# Manages an interface on a given router or switch
+#
+
+require 'puppet/util/network_device/ipcalc'
+
+Puppet::Type.newtype(:interface) do
+
+    @doc = "This represents a router or switch interface. It is possible to manage
+    interface mode (access or trunking, native vlan and encapsulation), 
+    switchport characteristics (speed, duplex)."
+
+    apply_to_device
+
+    ensurable do
+      defaultvalues
+
+      aliasvalue :shutdown, :absent
+      aliasvalue :no_shutdown, :present
+
+      defaultto { :no_shutdown }
+    end
+
+    newparam(:name) do
+      desc "Interface name"
+    end
+
+    newparam(:device_url) do
+      desc "Url to connect to a router or switch."
+    end
+
+    newproperty(:description) do
+      desc "Interface description."
+
+      defaultto { @resource[:name] }
+    end
+
+    newproperty(:speed) do
+      desc "Interface speed."
+      newvalues(:auto, /^\d+/)
+    end
+
+    newproperty(:duplex) do
+      desc "Interface duplex."
+      newvalues(:auto, :full, :half)
+    end
+
+    newproperty(:native_vlan) do
+      desc "Interface native vlan (for access mode only)."
+      newvalues(/^\d+/)
+    end
+
+    newproperty(:encapsulation) do
+      desc "Interface switchport encapsulation."
+      newvalues(:none, :dot1q, :isl )
+    end
+
+    newproperty(:mode) do
+      desc "Interface switchport mode."
+      newvalues(:access, :trunk)
+    end
+
+    newproperty(:allowed_trunk_vlans) do
+      desc "Allowed list of Vlans that this trunk can forward."
+      newvalues(:all, /./)
+    end
+
+    newproperty(:etherchannel) do
+      desc "Channel group this interface is part of."
+      newvalues(/^\d+/)
+    end
+
+    newproperty(:ipaddress, :array_matching => :all) do
+      include Puppet::Util::NetworkDevice::IPCalc
+
+      desc "IP Address of this interface (it might not be possible to set an interface IP address 
+      it depends on the interface type and device type).
+      Valid format of ip addresses are:
+       * IPV4, like 127.0.0.1
+       * IPV4/prefixlength like 127.0.1.1/24
+       * IPV6/prefixlength like FE80::21A:2FFF:FE30:ECF0/128
+       * an optional suffix for IPV6 addresses from this list: eui-64, link-local
+      It is also possible to use an array of values. 
+      "
+
+      validate do |values|
+        values = [values] unless values.is_a?(Array)
+        values.each do |value|
+          self.fail "Invalid interface ip address" unless parse(value.gsub(/\s*(eui-64|link-local)\s*$/,''))
+        end
+      end
+
+      munge do |value|
+        option = value =~ /eui-64|link-local/i ? value.gsub(/^.*?\s*(eui-64|link-local)\s*$/,'\1') : nil
+        [parse(value.gsub(/\s*(eui-64|link-local)\s*$/,'')), option].flatten
+      end
+
+      def value_to_s(value)
+        value = [value] unless value.is_a?(Array)
+        value.map{ |v| "#{v[1].to_s}/#{v[0]} #{v[2]}"}.join(",")
+      end
+
+      def change_to_s(currentvalue, newvalue)
+        currentvalue = value_to_s(currentvalue) if currentvalue != :absent
+        newvalue = value_to_s(newvalue)
+        super(currentvalue, newvalue)
+      end
+    end
+end

data/lib/puppet/type/k5login.rb

@@ -1,5 +1,4 @@
 # Plug-in type for handling k5login files
-require 'puppet/util'
 
 Puppet::Type.newtype(:k5login) do
   @doc = "Manage the `.k5login` file for a user.  Specify the full path to
@@ -80,9 +79,7 @@ Puppet::Type.newtype(:k5login) do
 
     private
     def write(value)
-      Puppet::Util.replace_file(@resource[:name], 0644) do |f|
-        f.puts value
-      end
+      File.open(@resource[:name], "w") { |f| f.puts value.join("\n") }
     end
   end
 end

data/lib/puppet/type/macauthorization.rb

@@ -2,7 +2,7 @@ Puppet::Type.newtype(:macauthorization) do
 
   @doc = "Manage the Mac OS X authorization database.
     See the [Apple developer site](http://developer.apple.com/documentation/Security/Conceptual/Security_Overview/Security_Services/chapter_4_section_5.html) for more information.
-    
+
     **Autorequires:** If Puppet is managing the `/etc/authorization` file, each
     macauthorization resource will autorequire it."
 
@@ -33,8 +33,8 @@ Puppet::Type.newtype(:macauthorization) do
     desc "The name of the right or rule to be managed.
     Corresponds to 'key' in Authorization Services. The key is the name
     of a rule. A key uses the same naming conventions as a right. The
-    Security Server uses a rule’s key to match the rule with a right.
-    Wildcard keys end with a ‘.’. The generic rule has an empty key value.
+    Security Server uses a rule's key to match the rule with a right.
+    Wildcard keys end with a '.'. The generic rule has an empty key value.
     Any rights that do not match a specific rule use the generic rule."
 
     isnamevar

data/lib/puppet/type/mcx.rb

@@ -1,22 +1,3 @@
-#--
-# Copyright (C) 2008 Jeffrey J McCune.
-
-# This program and entire repository is free software; you can
-# redistribute it and/or modify it under the terms of the GNU
-# General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-# Author: Jeff McCune <mccune.jeff@gmail.com>
-
 Puppet::Type.newtype(:mcx) do
 
   @doc = "MCX object management using DirectoryService on OS X.
@@ -81,9 +62,9 @@ MCX settings refer to, the MCX resource will autorequire that user, group, or co
   newproperty(:content, :required_features => :manages_content) do
     desc "The XML Plist.  The value of MCXSettings in DirectoryService.
     This is the standard output from the system command:
-        
+
         dscl localhost -mcxexport /Local/Default/<ds_type>/ds_name
-    
+
     Note that `ds_type` is capitalized and plural in the dscl command."
   end
 

data/lib/puppet/type/router.rb

@@ -0,0 +1,14 @@
+#
+# Manage a router abstraction
+#
+
+module Puppet
+  newtype(:router) do
+    @doc = "Manages connected router."
+
+    newparam(:url) do
+      desc "An URL to access the router of the form (ssh|telnet)://user:pass:enable@host/."
+      isnamevar
+    end
+  end
+end

data/lib/puppet/type/schedule.rb

@@ -43,6 +43,8 @@ module Puppet
       This will cause resources to be applied every 30 minutes by default.
       "
 
+    apply_to_all
+
     newparam(:name) do
       desc "The name of the schedule.  This name is used to retrieve the
         schedule when assigning it to an object:

data/lib/puppet/type/service.rb

@@ -108,6 +108,8 @@ module Puppet
         this default behavior."
 
       newvalues(:true, :false)
+
+      defaultto :true
     end
     newparam(:name) do
       desc "The name of the service to run.  This name is used to find

data/lib/puppet/type/sshkey.rb

@@ -41,7 +41,7 @@ module Puppet
           raise Puppet::Error, "Aliases cannot include whitespace"
         end
         if value =~ /,/
-          raise Puppet::Error, "Aliases cannot include whitespace"
+          raise Puppet::Error, "Aliases must be provided as an array, not a comma-separated list"
         end
       end
     end
@@ -50,6 +50,11 @@ module Puppet
       desc "The host name that the key is associated with."
 
       isnamevar
+
+      validate do |value|
+        raise Puppet::Error, "Resourcename cannot include whitespaces" if value =~ /\s/
+        raise Puppet::Error, "No comma in resourcename allowed. If you want to specify aliases use the host_aliases property" if value.include?(',')
+      end
     end
 
     newproperty(:target) do

data/lib/puppet/type/tidy.rb

@@ -141,15 +141,17 @@ Puppet::Type.newtype(:tidy) do
   newparam(:size) do
     desc "Tidy files whose size is equal to or greater than
       the specified size.  Unqualified values are in kilobytes, but
-      *b*, *k*, and *m* can be appended to specify *bytes*, *kilobytes*,
-      and *megabytes*, respectively.  Only the first character is
-      significant, so the full word can also be used."
+      *b*, *k*, *m*, *g*, and *t* can be appended to specify *bytes*,
+      *kilobytes*, *megabytes*, *gigabytes*, and *terabytes*, respectively.
+      Only the first character is significant, so the full word can also 
+      be used."
 
     @@sizeconvertors = {
       :b => 0,
       :k => 1,
       :m => 2,
-      :g => 3
+      :g => 3,
+      :t => 4
     }
 
     def convert(unit, multi)
@@ -207,7 +209,9 @@ Puppet::Type.newtype(:tidy) do
     []
   end
 
-  @depthfirst = true
+  def depthfirst?
+    true
+  end
 
   def initialize(hash)
     super
@@ -236,10 +240,6 @@ Puppet::Type.newtype(:tidy) do
     []
   end
 
-  def eval_generate
-    []
-  end
-
   def generate
     return [] unless stat(self[:path])
 
@@ -252,7 +252,7 @@ Puppet::Type.newtype(:tidy) do
 
     if parameter
       files = Puppet::FileServing::Fileset.new(self[:path], parameter).files.collect do |f|
-        f == "." ? self[:path] : File.join(self[:path], f)
+        f == "." ? self[:path] : ::File.join(self[:path], f)
       end
     else
       files = [self[:path]]
@@ -268,7 +268,7 @@ Puppet::Type.newtype(:tidy) do
     files_by_name = result.inject({}) { |hash, file| hash[file[:path]] = file; hash }
 
     files_by_name.keys.sort { |a,b| b <=> b }.each do |path|
-      dir = File.dirname(path)
+      dir = ::File.dirname(path)
       next unless resource = files_by_name[dir]
       if resource[:require]
         resource[:require] << Puppet::Resource.new(:file, path)
@@ -319,7 +319,7 @@ Puppet::Type.newtype(:tidy) do
 
   def stat(path)
     begin
-      File.lstat(path)
+      ::File.lstat(path)
     rescue Errno::ENOENT => error
       info "File does not exist"
       return nil

data/lib/puppet/type/user.rb

@@ -13,7 +13,7 @@ module Puppet
       This resource type uses the prescribed native tools for creating
       groups and generally uses POSIX APIs for retrieving information
       about them.  It does not directly modify `/etc/passwd` or anything.
-      
+
       **Autorequires:** If Puppet is managing the user's primary group (as provided in the `gid` attribute), the user resource will autorequire that group. If Puppet is managing any role accounts corresponding to the user's roles, the user resource will autorequire those role accounts."
 
     feature :allows_duplicates,
@@ -39,6 +39,9 @@ module Puppet
    feature :system_users,
      "The provider allows you to create system users with lower UIDs."
 
+    feature :manages_aix_lam,
+      "The provider can manage AIX Loadable Authentication Module (LAM) system."
+
     newproperty(:ensure, :parent => Puppet::Property::Ensure) do
       newvalue(:present, :event => :user_created) do
         provider.create
@@ -165,14 +168,6 @@ module Puppet
           return "changed password"
         end
       end
-
-      def is_to_s( currentvalue )
-        return '[old password hash redacted]'
-      end
-      def should_to_s( newvalue )
-        return '[new password hash redacted]'
-      end
-
     end
 
     newproperty(:password_min_age, :required_features => :manages_password_age) do
@@ -453,5 +448,37 @@ module Puppet
     newproperty(:project, :required_features => :manages_solaris_rbac) do
       desc "The name of the project associated with a user"
     end
+
+    newparam(:ia_load_module, :required_features => :manages_aix_lam) do
+      desc "The name of the I&A module to use to manage this user"
+    end
+
+    newproperty(:attributes, :parent => Puppet::Property::KeyValue, :required_features => :manages_aix_lam) do
+      desc "Specify user AIX attributes in an array of keyvalue pairs"
+
+      def membership
+        :attribute_membership
+      end
+
+      def delimiter
+        " "
+      end
+
+      validate do |value|
+        raise ArgumentError, "Attributes value pairs must be seperated by an =" unless value.include?("=")
+      end
+    end
+
+    newparam(:attribute_membership) do
+      desc "Whether specified attribute value pairs should be treated as the only attributes
+        of the user or whether they should merely
+        be treated as the minimum list."
+
+      newvalues(:inclusive, :minimum)
+
+      defaultto :minimum
+    end
+
+
   end
 end

data/lib/puppet/type/vlan.rb

@@ -0,0 +1,26 @@
+#
+# Manages a Vlan on a given router or switch
+#
+
+Puppet::Type.newtype(:vlan) do
+    @doc = "This represents a router or switch vlan."
+
+    apply_to_device
+
+    ensurable
+
+    newparam(:name) do
+      desc "Vlan id. It must be a number"
+      isnamevar
+
+      newvalues(/^\d+/)
+    end
+
+    newproperty(:description) do
+      desc "Vlan name"
+    end
+
+    newparam(:device_url) do
+      desc "Url to connect to a router or switch."
+    end
+end

data/lib/puppet/type/whit.rb

@@ -5,7 +5,19 @@ Puppet::Type.newtype(:whit) do
     desc "The name of the whit, because it must have one."
   end
 
+
+  # Hide the fact that we're a whit from logs
   def to_s
-    "Class[#{name}]"
+    name.sub(/^completed_|^admissible_/, "")
+  end
+
+  def path
+    to_s
+  end
+
+  def refresh
+    # We don't do anything with them, but we need this to
+    #   show that we are "refresh aware" and not break the
+    #   chain of propogation.
   end
 end

data/lib/puppet/type/zfs.rb

@@ -10,32 +10,124 @@ module Puppet
       desc "The full name for this filesystem. (including the zpool)"
     end
 
-    newproperty(:mountpoint) do
-      desc "The mountpoint property."
+    newproperty(:aclinherit) do
+      desc "The aclinherit property. Values: discard | noallow | restricted | passthrough | passthrough-x"
+    end
+
+    newproperty(:aclmode) do
+      desc "The aclmode property. Values: discard | groupmask | passthrough"
+    end
+
+    newproperty(:atime) do
+      desc "The atime property. Values: on | off"
+    end
+
+    newproperty(:canmount) do
+      desc "The canmount property. Values: on | off | noauto"
+    end
+
+    newproperty(:checksum) do
+      desc "The checksum property. Values: on | off | fletcher2 | fletcher4 | sha256"
     end
 
     newproperty(:compression) do
-      desc "The compression property."
+      desc "The compression property. Values: on | off | lzjb | gzip | gzip-[1-9] | zle"
     end
 
     newproperty(:copies) do
-      desc "The copies property."
+      desc "The copies property. Values: 1 | 2 | 3"
+    end
+
+    newproperty(:devices) do
+      desc "The devices property. Values: on | off"
+    end
+
+    newproperty(:exec) do
+      desc "The exec property. Values: on | off"
+    end
+
+    newproperty(:logbias) do
+      desc "The logbias property. Values: latency | throughput"
+    end
+
+    newproperty(:mountpoint) do
+      desc "The mountpoint property. Values: <path> | legacy | none"
+    end
+
+    newproperty(:nbmand) do
+      desc "The nbmand property. Values: on | off"
+    end
+
+    newproperty(:primarycache) do
+      desc "The primarycache property. Values: all | none | metadata"
     end
 
     newproperty(:quota) do
-      desc "The quota property."
+      desc "The quota property. Values: <size> | none"
+    end
+
+    newproperty(:readonly) do
+      desc "The readonly property. Values: on | off"
+    end
+
+    newproperty(:recordsize) do
+      desc "The recordsize property. Values: 512 to 128k, power of 2"
+    end
+
+    newproperty(:refquota) do
+      desc "The refquota property. Values: <size> | none"
+    end
+
+    newproperty(:refreservation) do
+      desc "The refreservation property. Values: <size> | none"
     end
 
     newproperty(:reservation) do
-      desc "The reservation property."
+      desc "The reservation property. Values: <size> | none"
+    end
+
+    newproperty(:secondarycache) do
+      desc "The secondarycache property. Values: all | none | metadata"
+    end
+
+    newproperty(:setuid) do
+      desc "The setuid property. Values: on | off"
+    end
+
+    newproperty(:shareiscsi) do
+      desc "The shareiscsi property. Values: on | off | type=<type>"
     end
 
     newproperty(:sharenfs) do
-      desc "The sharenfs property."
+      desc "The sharenfs property. Values: on | off | share(1M) options"
+    end
+
+    newproperty(:sharesmb) do
+      desc "The sharesmb property. Values: on | off | sharemgr(1M) options"
     end
 
     newproperty(:snapdir) do
-      desc "The snapdir property."
+      desc "The snapdir property. Values: hidden | visible"
+    end
+
+    newproperty(:version) do
+      desc "The version property. Values: 1 | 2 | 3 | 4 | current"
+    end
+
+    newproperty(:volsize) do
+      desc "The volsize property. Values: <size>"
+    end
+
+    newproperty(:vscan) do
+      desc "The vscan property. Values: on | off"
+    end
+
+    newproperty(:xattr) do
+      desc "The xattr property. Values: on | off"
+    end
+
+    newproperty(:zoned) do
+      desc "The zoned property. Values: on | off"
     end
 
     autorequire(:zpool) do