puppet 0.23.1 → 0.23.2

data/lib/puppet/parser/resource/param.rb

@@ -12,7 +12,7 @@ class Puppet::Parser::Resource::Param
     end
 
     def inspect
-        "#<#{self.class} @name => #{self.name}, @value => #{self.value}, @source => #{self.source.type}>"
+        "#<#{self.class} @name => #{self.name}, @value => #{self.value}, @source => #{self.source.name}>"
     end
 
     def line_to_i
@@ -88,4 +88,4 @@ class Puppet::Parser::Resource::Param
     end
 end
 
-# $Id: param.rb 2706 2007-07-18 19:47:09Z luke $
+# $Id: param.rb 2742 2007-08-03 23:49:53Z luke $

data/lib/puppet/provider.rb

@@ -337,7 +337,9 @@ class Puppet::Provider
 
     def initialize(resource = nil)
         if resource.is_a?(Hash)
-            @property_hash = resource.dup
+            # We don't use a duplicate here, because some providers (ParsedFile, at least)
+            # use the hash here for later events.
+            @property_hash = resource
         elsif resource
             @resource = resource if resource
             # LAK 2007-05-09: Keep the model stuff around for backward compatibility
@@ -354,7 +356,7 @@ class Puppet::Provider
         elsif self.resource
             resource.name
         else
-            raise Puppet::DevError, "No resource and no name in property hash"
+            raise Puppet::DevError, "No resource and no name in property hash in %s instance" % self.class.name
         end
     end
 
@@ -370,4 +372,4 @@ class Puppet::Provider
     end
 end
 
-# $Id: provider.rb 2588 2007-06-15 14:05:10Z luke $
+# $Id: provider.rb 2753 2007-08-07 02:38:45Z luke $

data/lib/puppet/provider/cron/crontab.rb

@@ -78,10 +78,10 @@ Puppet::Type.type(:cron).provide(:crontab,
     # Return the header placed at the top of each generated file, warning
     # users that modifying this file manually is probably a bad idea.
     def self.header
-%{# HEADER This file was autogenerated at #{Time.now} by puppet.
-# HEADER While it can still be managed manually, it is definitely notrecommended.
-# HEADER Note particularly that the comments starting with 'Puppet Name' should
-# HEADER not be deleted, as doing so could cause duplicate cron jobs.\n}
+%{# HEADER: This file was autogenerated at #{Time.now} by puppet.
+# HEADER: While it can still be managed manually, it is definitely not recommended.
+# HEADER: Note particularly that the comments starting with 'Puppet Name' should
+# HEADER: not be deleted, as doing so could cause duplicate cron jobs.\n}
     end
 
     # See if we can match the record against an existing cron job.
@@ -134,31 +134,44 @@ Puppet::Type.type(:cron).provide(:crontab,
     # Collapse name and env records.
     def self.prefetch_hook(records)
         name = nil
-        envs = []
-        records.each { |record|
+        envs = nil
+        result = records.each { |record|
             case record[:record_type]
             when :comment:
                 if record[:name]
                     name = record[:name]
                     record[:skip] = true
+                    
+                    # Start collecting env values
+                    envs = []
                 end
             when :environment:
-                if name
+                # If we're collecting env values (meaning we're in a named cronjob),
+                # store the line and skip the record.
+                if envs
                     envs << record[:line]
                     record[:skip] = true
                 end
+            when :blank:
+                # nothing
             else
                 if name
                     record[:name] = name
                     name = nil
                 end
-                if envs.empty?
+                if envs.nil? or envs.empty?
                     record[:environment] = :absent
                 else
+                    # Collect all of the environment lines, and mark the records to be skipped,
+                    # since their data is included in our crontab record.
                     record[:environment] = envs
+
+                    # And turn off env collection again
+                    envs = nil
                 end
             end
         }.reject { |record| record[:skip] }
+        result
     end
 
     def self.to_file(records)
@@ -185,4 +198,4 @@ Puppet::Type.type(:cron).provide(:crontab,
     end
 end
 
-# $Id: crontab.rb 2697 2007-07-14 21:13:04Z luke $
+# $Id: crontab.rb 2750 2007-08-06 17:59:37Z luke $

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

@@ -0,0 +1,23 @@
+#  Created by Jeff McCune on 2007-07-22
+#  Copyright (c) 2007. All rights reserved.
+#
+# This program 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 (version 2 of the License)
+# 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
+
+require 'puppet/provider/nameservice/directoryservice'
+
+Puppet::Type.type(:group).provide :directoryservice, :parent => Puppet::Provider::NameService::DirectoryService do
+    desc "Group management using DirectoryService on OS X."
+    
+    commands :dscl => "/usr/bin/dscl"
+    confine :operatingsystem => :darwin
+    #defaultfor :operatingsystem => :darwin
+end

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

@@ -0,0 +1,251 @@
+require 'puppet/provider/parsedfile'
+require 'erb'
+
+Puppet::Type.type(:interface).provide(:redhat) do
+	INTERFACE_DIR = "/etc/sysconfig/network-scripts"
+    confine :exists => INTERFACE_DIR
+    defaultfor :operatingsystem => [:fedora, :centos, :redhat]
+
+    # Create the setter/gettor methods to match the model.
+    mk_resource_methods
+
+    ALIAS_TEMPLATE = ERB.new <<-ALIAS
+DEVICE=<%= self.device %>
+ONBOOT=<%= self.on_boot %>
+BOOTPROTO=<%= self.bootproto %>
+IPADDR=<%= self.name %>
+NETMASK=<%= self.netmask %>
+BROADCAST=
+ALIAS
+
+
+    LOOPBACK_TEMPLATE = ERB.new <<-LOOPBACKDUMMY
+DEVICE=<%= self.device %>
+ONBOOT=<%= self.on_boot %>
+BOOTPROTO=static
+IPADDR=<%= self.name %>
+NETMASK=255.255.255.255
+BROADCAST=
+LOOPBACKDUMMY
+
+	# maximum number of dummy interfaces
+	MAX_DUMMIES = 10
+
+	# maximum number of aliases per interface
+	MAX_ALIASES_PER_IFACE = 10
+
+
+	@@dummies = []
+	@@aliases = Hash.new { |hash, key| hash[key] = [] }
+
+	# calculate which dummy interfaces are currently already in
+	# use prior to needing to call self.next_dummy later on.
+	def self.instances
+		# parse all of the config files at once
+		Dir.glob("%s/ifcfg-*" % INTERFACE_DIR).collect do |file|
+
+			record = parse(file)
+
+			# store the existing dummy interfaces
+			if record[:interface_type] == :dummy
+				@@dummies << record[:ifnum] unless @@dummies.include?(record[:ifnum])
+			end
+
+			if record[:interface_type] == :alias
+				@@aliases[record[:interface]] << record[:ifnum]
+			end
+            new(record)
+		end
+	end
+
+	# return the next avaliable dummy interface number, in the case where
+	# ifnum is not manually specified
+	def self.next_dummy
+		MAX_DUMMIES.times do |i|
+			unless @@dummies.include?(i.to_s)
+				@@dummies << i.to_s
+				return i.to_s
+			end
+		end
+	end
+
+	# return the next available alias on a given interface, in the case
+	# where ifnum if not manually specified
+	def self.next_alias(interface)
+		MAX_ALIASES_PER_IFACE.times do |i|
+			unless @@aliases[interface].include?(i.to_s)
+				@@aliases[interface] << i.to_s
+				return i.to_s
+			end
+		end
+	end
+
+    # base the ifnum, for dummy / loopback interface in linux
+    # on the last octect of the IP address
+
+    # Parse the existing file.
+    def self.parse(file)
+
+        opts = {}
+        return opts unless FileTest.exists?(file)
+
+        File.open(file) do |f|
+            f.readlines.each do |line|
+                if line =~ /^(\w+)=(.+)$/
+                    opts[$1.downcase.intern] = $2
+                end
+            end
+        end
+
+        # figure out the "real" device information
+        case opts[:device]
+        when /:/:
+            if opts[:device].include?(":")
+                opts[:interface], opts[:ifnum] = opts[:device].split(":")
+            end
+
+            opts[:interface_type] = :alias
+        when /^dummy/:
+            opts[:interface_type] = :loopback
+			opts[:interface] = "dummy"
+
+			# take the number of the dummy interface, as this is used
+			# when working out whether to call next_dummy when dynamically
+			# creating these
+			opts[:ifnum] = opts[:device].sub("dummy",'')
+
+			@@dummies << opts[:ifnum].to_s unless @@dummies.include?(opts[:ifnum].to_s)
+        else
+			opts[:interface_type] = :normal
+			opts[:interface] = opts[:device]
+        end
+
+		# translate whether we come up on boot to true/false
+		case opts[:onboot].downcase
+		when "yes":
+			opts[:onboot] = :true
+		when "no":
+			opts[:onboot] = :false
+		else
+			# this case should never happen, but just in case
+			opts[:onboot] = false
+		end
+
+
+        # Remove any attributes we don't want.  These would be
+        # pretty easy to support.
+        [:bootproto, :broadcast, :netmask, :device].each do |opt|
+            if opts.include?(opt)
+                opts.delete(opt)
+            end
+        end
+
+        if opts.include?(:ipaddr)
+            opts[:name] = opts[:ipaddr]
+            opts.delete(:ipaddr)
+        end
+
+        return opts
+
+    end
+
+    # Prefetch our interface list, yo.
+    def self.prefetch(resources)
+        instances.each do |prov|
+            if resource = resources[prov.name]
+                resource.provider = prov
+            end
+        end
+    end
+
+    def create
+        @resource.class.validproperties.each do |property|
+            if value = @resource.should(property)
+                @property_hash[property] = value
+            end
+        end
+        @property_hash[:name] = @resource.name
+
+        return (@resource.class.name.to_s + "_created").intern
+    end
+
+    def destroy
+        File.unlink(@resource[:target])
+    end
+
+    def exists?
+        FileTest.exists?(@resource[:target])
+    end
+
+    # generate the content for the interface file, so this is dependent
+    # on whether we are adding an alias to a real interface, or a loopback
+    # address (also dummy) on linux. For linux it's quite involved, and we
+    # will use an ERB template
+	def generate
+		# choose which template to use for the interface file, based on
+		# the interface type
+        case @resource.should(:interface_type)
+        when :loopback
+			return LOOPBACK_TEMPLATE.result(binding)
+        when :alias
+			return ALIAS_TEMPLATE.result(binding)
+		end
+	end
+
+    # Where should the file be written out?
+	# This defaults to INTERFACE_DIR/ifcfg-<namevar>, but can have a
+	# more symbolic name by setting interface_desc in the type. 
+    def file_path
+		@resource[:interface_desc] ||= @resource[:name]
+       	return File.join(INTERFACE_DIR, "ifcfg-" + @resource[:interface_desc])
+
+    end
+
+	# create the device name, so this based on the IP, and interface + type
+	def device
+		case @resource.should(:interface_type)
+		when :loopback
+			@property_hash[:ifnum] ||= self.class.next_dummy
+        	return "dummy" + @property_hash[:ifnum]
+		when :alias
+			@property_hash[:ifnum] ||= self.class.next_alias(@resource[:interface])
+        	return @resource[:interface] + ":" + @property_hash[:ifnum]
+		end
+    end
+
+	# whether the device is to be brought up on boot or not. converts
+	# the true / false of the type, into yes / no values respectively
+	# writing out the ifcfg-* files
+	def on_boot
+		case @property_hash[:onboot].to_s
+		when "true"
+			return "yes"
+		when "false"
+			return "no"
+		else
+			return "neither"
+		end
+	end
+
+    # Write the new file out.
+    def flush
+        # Don't flush to disk if we're removing the config.
+        return if @resource.should(:ensure) == :absent
+
+        @property_hash.each do |name, val|
+            if val == :absent
+                raise ArgumentError, "Propety %s must be provided" % val
+            end
+        end
+
+        File.open(@resource[:target], "w") do |f|
+            f.puts generate()
+        end
+    end
+
+    def prefetch
+        @property_hash = self.class.parse(@resource[:target])
+    end
+end
+
+# $Id: redhat.rb 2747 2007-08-05 19:01:39Z luke $

data/lib/puppet/provider/interface/sunos.rb

@@ -0,0 +1,116 @@
+require 'puppet/provider/parsedfile'
+require 'erb'
+
+Puppet::Type.type(:interface).provide(:sunos,
+	:default_target => "/etc/hostname.lo0",
+	:parent => Puppet::Provider::ParsedFile,
+	:filetype => :flat
+) do
+	
+    confine :kernel => "SunOS"
+
+    # Two types of lines:
+    #   the first line does not start with 'addif'
+    #   the rest do
+	record_line :sunos, :fields => %w{interface_type name ifopts onboot}, :rts => true, :absent => "", :block_eval => :instance do
+        # Parse our interface line
+        def process(line)
+            details = {:ensure => :present}
+
+            values = line.split(/\s+/)
+
+            # Are we the primary interface?
+            if values[0] == "addif"
+                details[:interface_type] = :alias
+                values.shift
+            else
+                details[:interface_type] = :normal
+            end
+
+            # Should the interface be up by default?
+            if values[-1] == "up"
+                details[:onboot] = :true
+                values.pop
+            else
+                details[:onboot] = :false
+            end
+
+            # Set the interface name.
+            details[:name] = values.shift
+
+            # Handle any interface options
+            unless values.empty?
+                details[:ifopts] = values.join(" ")
+            end
+
+            return details
+        end
+
+        # Turn our record into a line.
+        def to_line(details)
+            ret = []
+            if details[:interface_type] != :normal
+                ret << "addif"
+            end
+            ret << details[:name]
+
+            if details[:ifopts] and details[:ifopts] != :absent
+                if details[:ifopts].is_a?(Array)
+                    ret << details[:ifopts].join(" ")
+                else
+                    ret << details[:ifopts]
+                end
+            end
+
+            if details[:onboot] and details[:onboot] != :false
+                ret << "up"
+            end
+
+            return ret.join(" ")
+        end
+    end
+
+	def self.header
+		# over-write the default puppet behaviour of adding a header
+		# because on further investigation this breaks the solaris
+		# init scripts
+		%{}
+	end
+
+    # Get a list of interface instances.
+    def self.instances
+		Dir.glob("/etc/hostname.*").collect do |file|
+            # We really only expect one record from each file
+            parse(file).shift
+        end.collect { |record| new(record) }
+    end
+
+	def self.match(hash)
+		# see if we can match the has against an existing object
+		if model.find { |obj| obj.value(:name) == hash[:name] }
+			return obj
+        else
+            return false
+		end	
+	end
+
+    # Prefetch our interface list, yo.
+    def self.prefetch(resources)
+        instances.each do |prov|
+            if resource = resources[prov.name]
+                resource.provider = prov
+            end
+        end
+    end
+
+    # Where should the file be written out?  Can be overridden by setting
+    # :target in the model.
+    def file_path
+        unless @resource[:interface]
+            raise ArgumentError, "You must provide the interface name on Solaris"
+        end
+       	return File.join("/etc", "hostname." + @resource[:interface])
+    end
+end
+
+# $Id: sunos.rb 2747 2007-08-05 19:01:39Z luke $