puppet 0.18.4 → 0.22.4

data/lib/puppet/type/yumrepo.rb

@@ -1,16 +1,14 @@
 # Description of yum repositories
 
-require 'puppet/statechange'
-require 'puppet/inifile'
+require 'puppet/propertychange'
+require 'puppet/util/inifile'
 require 'puppet/type/parsedtype'
 
 module Puppet
-
-    # A state for one entry in a .ini-style file
-    class IniState < Puppet::State
-
+    # A property for one entry in a .ini-style file
+    class IniProperty < Puppet::Property
         def insync?
-            # A should state of :absent is the same as nil
+            # A should property of :absent is the same as nil
             if is.nil? && (should.nil? || should == :absent)
                 return true
             end
@@ -21,7 +19,7 @@ module Puppet
             if insync?
                 result = nil
             else
-                result = set
+                result = set(self.should)
                 if should == :absent
                     parent.section[inikey] = nil
                 else
@@ -39,8 +37,8 @@ module Puppet
             name.to_s
         end
 
-        # Set the key associated with this state to KEY, instead
-        # of using the state's NAME
+        # Set the key associated with this property to KEY, instead
+        # of using the property's NAME
         def self.inikey(key)
             # Override the inikey instance method
             # Is there a way to do this without resorting to strings ?
@@ -51,7 +49,7 @@ module Puppet
 
     end
 
-    # Doc string for states that can be made 'absent'
+    # Doc string for properties that can be made 'absent'
     ABSENT_DOC="Set this to 'absent' to remove it from the file completely"
 
     newtype(:yumrepo) do
@@ -74,7 +72,7 @@ module Puppet
             attr_accessor :yumconf
         end
 
-        self.filetype = Puppet::FileType.filetype(:flat)
+        self.filetype = Puppet::Util::FileType.filetype(:flat)
 
         @inifile = nil
         
@@ -83,7 +81,28 @@ module Puppet
         # Where to put files for brand new sections
         @defaultrepodir = nil
 
-        # Return the Puppet::IniConfig::File for the whole yum config
+        def self.list
+            l = []
+            check = validproperties
+            clear
+            inifile.each_section do |s|
+                next if s.name == "main"
+                obj = create(:name => s.name, :check => check)
+                obj.retrieve
+                obj.eachproperty do |property|
+                    if property.is.nil?
+                        obj.delete(property.name)
+                    else
+                        property.should = property.is
+                    end
+                end
+                obj.delete(:check)
+                l << obj
+            end
+            l
+        end
+
+        # Return the Puppet::Util::IniConfig::File for the whole yum config
         def self.inifile
             if @inifile.nil?
                 @inifile = read()
@@ -115,7 +134,7 @@ module Puppet
         # Non-test code should use self.inifile to get at the
         # underlying file
         def self.read
-            result = Puppet::IniConfig::File.new()
+            result = Puppet::Util::IniConfig::File.new()
             result.read(yumconf)
             main = result['main']
             if main.nil?
@@ -142,7 +161,7 @@ module Puppet
             return result
         end
 
-        # Return the Puppet::IniConfig::Section with name NAME
+        # Return the Puppet::Util::IniConfig::Section with name NAME
         # from the yum config
         def self.section(name)
             result = inifile[name]
@@ -170,7 +189,7 @@ module Puppet
             super
         end
 
-        # Return the Puppet::IniConfig::Section for this yumrepo element
+        # Return the Puppet::Util::IniConfig::Section for this yumrepo element
         def section
             self.class.section(self[:name])
         end
@@ -182,16 +201,16 @@ module Puppet
             # writing the whole file
             # A cleaner solution would be to either use the composite
             # pattern and encapsulate all changes into a change that does
-            # not depend on a state and triggers storing, or insert another
+            # not depend on a property and triggers storing, or insert another
             # change at the end of changes to trigger storing Both
-            # solutions require that the StateChange interface be
+            # solutions require that the PropertyChange interface be
             # abstracted so that it can work with a change that is not
-            # directly backed by a State
+            # directly backed by a Property
             unless changes.empty?
                 class << changes[-1]
                     def go
                         result = super
-                        self.state.parent.store
+                        self.property.parent.store
                         return result
                     end
                 end
@@ -209,7 +228,7 @@ module Puppet
             isnamevar
         end
 
-        newstate(:descr, Puppet::IniState) do
+        newproperty(:descr, :parent => Puppet::IniProperty) do
             desc "A human readable description of the repository. 
                   #{ABSENT_DOC}"
             newvalue(:absent) { self.should = :absent }
@@ -217,7 +236,7 @@ module Puppet
             inikey "name"
         end
         
-        newstate(:mirrorlist, Puppet::IniState) do
+        newproperty(:mirrorlist, :parent => Puppet::IniProperty) do
             desc "The URL that holds the list of mirrors for this repository.
                   #{ABSENT_DOC}"
             newvalue(:absent) { self.should = :absent }
@@ -225,21 +244,21 @@ module Puppet
             newvalue(/.*/) { }
         end
 
-        newstate(:baseurl, Puppet::IniState) do
+        newproperty(:baseurl, :parent => Puppet::IniProperty) do
             desc "The URL for this repository.\n#{ABSENT_DOC}"
             newvalue(:absent) { self.should = :absent }
             # Should really check that it's a valid URL
             newvalue(/.*/) { }
         end
         
-        newstate(:enabled, Puppet::IniState) do
+        newproperty(:enabled, :parent => Puppet::IniProperty) do
             desc "Whether this repository is enabled or disabled. Possible 
                   values are '0', and '1'.\n#{ABSENT_DOC}"
             newvalue(:absent) { self.should = :absent }
             newvalue(%r{(0|1)}) { }
         end
 
-        newstate(:gpgcheck, Puppet::IniState) do
+        newproperty(:gpgcheck, :parent => Puppet::IniProperty) do
             desc "Whether to check the GPG signature on packages installed
                   from this repository. Possible values are '0', and '1'.
                   \n#{ABSENT_DOC}"
@@ -247,7 +266,7 @@ module Puppet
             newvalue(%r{(0|1)}) { }
         end
 
-        newstate(:gpgkey, Puppet::IniState) do
+        newproperty(:gpgkey, :parent => Puppet::IniProperty) do
             desc "The URL for the GPG key with which packages from this
                   repository are signed.\n#{ABSENT_DOC}"
             newvalue(:absent) { self.should = :absent }
@@ -255,14 +274,14 @@ module Puppet
             newvalue(/.*/) { }
         end
 
-        newstate(:include, Puppet::IniState) do
+        newproperty(:include, :parent => Puppet::IniProperty) do
             desc "A URL from which to include the config.\n#{ABSENT_DOC}"
             newvalue(:absent) { self.should = :absent }
             # Should really check that it's a valid URL
             newvalue(/.*/) { }
         end
 
-        newstate(:exclude, Puppet::IniState) do
+        newproperty(:exclude, :parent => Puppet::IniProperty) do
             desc "List of shell globs. Matching packages will never be
                   considered in updates or installs for this repo.
                   #{ABSENT_DOC}"
@@ -270,7 +289,7 @@ module Puppet
             newvalue(/.*/) { }
         end
 
-        newstate(:includepkgs, Puppet::IniState) do
+        newproperty(:includepkgs, :parent => Puppet::IniProperty) do
             desc "List of shell globs. If this is set, only packages
                   matching one of the globs will be considered for
                   update or install.\n#{ABSENT_DOC}"
@@ -278,7 +297,7 @@ module Puppet
             newvalue(/.*/) { }
         end
 
-        newstate(:enablegroups, Puppet::IniState) do
+        newproperty(:enablegroups, :parent => Puppet::IniProperty) do
             desc "Determines whether yum will allow the use of
               package groups for this  repository. Possible 
               values are '0', and '1'.\n#{ABSENT_DOC}"
@@ -286,27 +305,27 @@ module Puppet
             newvalue(%r{(0|1)}) { }
         end
 
-        newstate(:failovermethod, Puppet::IniState) do
+        newproperty(:failovermethod, :parent => Puppet::IniProperty) do
             desc "Either 'roundrobin' or 'priority'.\n#{ABSENT_DOC}"
             newvalue(:absent) { self.should = :absent }
             newvalue(%r(roundrobin|priority)) { }
         end
 
-        newstate(:keepalive, Puppet::IniState) do
+        newproperty(:keepalive, :parent => Puppet::IniProperty) do
             desc "Either '1' or '0'. This tells yum whether or not HTTP/1.1 
               keepalive  should  be  used with this repository.\n#{ABSENT_DOC}"
             newvalue(:absent) { self.should = :absent }
             newvalue(%r{(0|1)}) { }
         end
 
-        newstate(:timeout, Puppet::IniState) do
+        newproperty(:timeout, :parent => Puppet::IniProperty) do
             desc "Number of seconds to wait for a connection before timing 
                   out.\n#{ABSENT_DOC}"
             newvalue(:absent) { self.should = :absent }
             newvalue(%r{[0-9]+}) { }
         end
 
-        newstate(:metadata_expire, Puppet::IniState) do
+        newproperty(:metadata_expire, :parent => Puppet::IniProperty) do
             desc "Number of seconds after which the metadata will expire.
                   #{ABSENT_DOC}"
             newvalue(:absent) { self.should = :absent }

data/lib/puppet/type/zone.rb

@@ -1,18 +1,18 @@
 Puppet::Type.newtype(:zone) do
     @doc = "Solaris zones."
 
-    # These states modify the zone configuration, and they need to provide
+    # These properties modify the zone configuration, and they need to provide
     # the text separately from syncing it, so all config statements can be rolled
     # into a single creation statement.
-    class ZoneConfigState < Puppet::State
+    class ZoneConfigProperty < Puppet::Property
         # Perform the config operation.
         def sync
-            @parent.cfg self.configtext
+            provider.setconfig self.configtext
         end
     end
 
-    # Those states that can have multiple instances.
-    class ZoneMultiConfigState < ZoneConfigState
+    # Those properties that can have multiple instances.
+    class ZoneMultiConfigProperty < ZoneConfigProperty
         def configtext
             list = @should
 
@@ -72,7 +72,7 @@ Puppet::Type.newtype(:zone) do
             only then can be ``running``.  Note also that ``halt`` is currently
             used to stop zones."
 
-        @states = {}
+        @properties = {}
 
         def self.newvalue(name, hash)
             if @parametervalues.is_a? Hash
@@ -81,7 +81,7 @@ Puppet::Type.newtype(:zone) do
 
             @parametervalues << name
 
-            @states[name] = hash
+            @properties[name] = hash
             hash[:name] = name
         end
 
@@ -112,11 +112,11 @@ Puppet::Type.newtype(:zone) do
             # the range op twice.
             if findex > sindex
                 list = @parametervalues[sindex..findex].collect do |name|
-                    @states[name]
+                    @properties[name]
                 end.reverse
             else
                 list = @parametervalues[findex..sindex].collect do |name|
-                    @states[name]
+                    @properties[name]
                 end
             end
 
@@ -141,8 +141,8 @@ Puppet::Type.newtype(:zone) do
             # everything between it and us.
             states = self.class.valueslice(self.is, self.should)
 
-            states.each do |st|
-                if method = st[dir]
+            properties.each do |prop|
+                if method = prop[dir]
                     warned = false
                     while @parent.processing?
                         unless warned
@@ -151,7 +151,7 @@ Puppet::Type.newtype(:zone) do
                         end
                         sleep 1
                     end
-                    @parent.send(method)
+                    provider.send(method)
                 else
                     raise Puppet::DevError, "Cannot move %s from %s" %
                         [dir, st[:name]]
@@ -161,7 +161,7 @@ Puppet::Type.newtype(:zone) do
             return ("zone_" + self.should.to_s).intern
         end
 
-        # Are we moving up the state tree?
+        # Are we moving up the property tree?
         def up?
             self.class.valueindex(self.is) < self.class.valueindex(self.should)
         end
@@ -178,7 +178,7 @@ Puppet::Type.newtype(:zone) do
             and cannot be changed."
     end
 
-    newstate(:ip, ZoneMultiConfigState) do
+    newproperty(:ip, :parent => ZoneMultiConfigProperty) do
         require 'ipaddr'
 
         desc "The IP address of the zone.  IP addresses must be specified
@@ -225,7 +225,7 @@ end
         end
     end
 
-    newstate(:autoboot, ZoneConfigState) do
+    newproperty(:autoboot, :parent => ZoneConfigProperty) do
         desc "Whether the zone should automatically boot."
 
         defaultto true
@@ -238,7 +238,7 @@ end
         end
     end
 
-    newstate(:pool, ZoneConfigState) do
+    newproperty(:pool, :parent => ZoneConfigProperty) do
         desc "The resource pool for this zone." 
 
         def configtext
@@ -246,7 +246,15 @@ end
         end
     end
 
-    newstate(:inherit, ZoneMultiConfigState) do
+    newproperty(:shares, :parent => ZoneConfigProperty) do
+        desc "Number of FSS CPU shares allocated to the zone."
+
+        def configtext
+            "add rctl\nset name=zone.cpu-shares\nadd value (priv=privileged,limit=#{self.should},action=none)\nend"
+        end
+    end
+
+    newproperty(:inherit, :parent => ZoneMultiConfigProperty) do
         desc "The list of directories that the zone inherits from the global
             zone.  All directories must be fully qualified."
 
@@ -277,35 +285,35 @@ end
     # only used to boot the zone the very first time.
     newparam(:sysidcfg) do
         desc %{The text to go into the sysidcfg file when the zone is first
-            booted.  The best way is to use a template:
+            booted.  The best way is to use a template::
                 
                 # $templatedir/sysidcfg
                 system_locale=en_US
                 timezone=GMT
                 terminal=xterms
                 security_policy=NONE
-                root_password=<%= password %>
+                root_password=&lt;%= password %>
                 timeserver=localhost
-                name_service=DNS {domain_name=<%= domain %>
-                        name_server=<%= nameserver %>}
-                network_interface=primary {hostname=<%= name %>
-                        ip_address=<%= ip %>
-                        netmask=<%= netmask %>
+                name_service=DNS {domain_name=&lt;%= domain %>
+                        name_server=&lt;%= nameserver %>}
+                network_interface=primary {hostname=&lt;%= realhostname %>
+                        ip_address=&lt;%= ip %>
+                        netmask=&lt;%= netmask %>
                         protocol_ipv6=no
-                        default_route=<%= defaultroute %>}
+                        default_route=&lt;%= defaultroute %>}
                 nfs4_domain=dynamic
 
-            And then call that:
+            And then call that::
 
                 zone { myzone:
                     ip => "bge0:192.168.0.23",
                     sysidcfg => template(sysidcfg),
-                    path => "/opt/zones/myzone"
+                    path => "/opt/zones/myzone",
+                    realhostname => "fully.qualified.domain.name"
                 }
 
             The sysidcfg only matters on the first booting of the zone,
-            so Puppet only checks for it at that time.
-        }
+            so Puppet only checks for it at that time.}
     end
 
     newparam(:path) do
@@ -329,6 +337,10 @@ end
         end
     end
 
+    newparam(:realhostname) do
+        desc "The actual hostname of the zone."
+    end
+
     # If Puppet is also managing the base dir or its parent dir, list them
     # both as prerequisites.
     autorequire(:file) do
@@ -339,51 +351,6 @@ end
         end
     end
 
-    # Convert the output of a list into a hash
-    def self.line2hash(line)
-        fields = [:id, :name, :ensure, :path]
-
-        hash = {}
-        line.split(":").each_with_index { |value, index|
-            hash[fields[index]] = value
-        }
-
-        # Configured but not installed zones do not have IDs
-        if hash[:id] == "-"
-            hash.delete(:id)
-        end
-
-        return hash
-    end
-
-    def self.list
-        %x{/usr/sbin/zoneadm list -cp}.split("\n").collect do |line|
-            hash = line2hash(line)
-
-            obj = nil
-            unless obj = @objects[hash[:name]]
-                obj = create(:name => hash[:name])
-            end
-
-            obj.setstatus(hash)
-
-            obj
-        end
-    end
-
-    # Execute a configuration string.  Can't be private because it's called
-    # by the states.
-    def cfg(str)
-        debug "Executing '%s' in zone %s" % [str, self[:name]]
-        IO.popen("/usr/sbin/zonecfg -z %s -f - 2>&1" % self[:name], "w") do |pipe|
-            pipe.puts str
-        end
-
-        unless $? == 0
-            raise ArgumentError, "Failed to apply configuration"
-        end
-    end
-
     # Perform all of our configuration steps.
     def configure
         # If the thing is entirely absent, then we need to create the config.
@@ -392,36 +359,20 @@ set zonepath=%s
 } % self[:path]
 
         # Then perform all of our configuration steps.
-        @states.each do |name, state|
-            if state.is_a? ZoneConfigState and ! state.insync?
-                str += state.configtext + "\n"
+        properties().each do |property|
+            if property.is_a? ZoneConfigProperty and ! property.insync?
+                str += property.configtext + "\n"
             end
         end
 
         str += "commit\n"
-        cfg(str)
-    end
-
-    def destroy
-        begin
-            execute("/usr/sbin/zonecfg -z #{self[:name]} delete -F")
-        rescue Puppet::ExecutionFailure => detail
-            self.fail "Could not destroy zone: %s" % detail
-        end
-    end
-
-    def install
-        begin
-            execute("/usr/sbin/zoneadm -z #{self[:name]} install")
-        rescue Puppet::ExecutionFailure => detail
-            self.fail "Could not install zone: %s" % detail
-        end
+        provider.setconfig(str)
     end
 
     # We need a way to test whether a zone is in process.  Our 'ensure'
-    # state models the static states, but we need to handle the temporary ones.
+    # property models the static states, but we need to handle the temporary ones.
     def processing?
-        if hash = statushash()
+        if hash = provider.statushash()
             case hash[:ensure]
             when "incomplete", "ready", "shutting_down"
                 true
@@ -434,14 +385,14 @@ set zonepath=%s
     end
 
     def retrieve
-        if hash = statushash()
+        if hash = provider.statushash()
             setstatus(hash)
 
             # Now retrieve the configuration itself and set appropriately.
-            getconfig()
+            config2status(provider.getconfig())
         else
-            @states.each do |name, state|
-                state.is = :absent
+            properties().each do |pr|
+                pr.is = :absent
             end
         end
     end
@@ -451,75 +402,15 @@ set zonepath=%s
         hash.each do |param, value|
             next if param == :name
             case self.class.attrtype(param)
-            when :state:
+            when :pr:
                 self.is = [param, value]
             else
                 self[param] = value
             end
         end
-
-        # For any configured items that are not found, mark absent.
-        @states.each do |name, st|
-            next unless st.is_a? ZoneConfigState
-
-            unless hash.has_key? st.name
-                st.is = :absent
-            end
-        end
-    end
-
-    def start
-        # Check the sysidcfg stuff
-        if cfg = self[:sysidcfg]
-            path = File.join(self[:path], "root", "etc", "sysidcfg")
-
-            unless File.exists?(path)
-                begin
-                    File.open(path, "w", 0600) do |f|
-                        f.puts cfg
-                    end
-                rescue => detail
-                    if Puppet[:debug]
-                        puts detail.stacktrace
-                    end
-                    raise Puppet::Error, "Could not create sysidcfg: %s" % detail
-                end
-            end
-        end
-
-        begin
-            execute("/usr/sbin/zoneadm -z #{self[:name]} boot")
-        rescue Puppet::ExecutionFailure => detail
-            self.fail "Could not start zone: %s" % detail
-        end
-    end
-
-    def stop
-        begin
-            execute("/usr/sbin/zoneadm -z #{self[:name]} halt")
-        rescue Puppet::ExecutionFailure => detail
-            self.fail "Could not halt zone: %s" % detail
-        end
-    end
-
-    def unconfigure
-        begin
-            execute("/usr/sbin/zonecfg -z #{self[:name]} delete -F")
-        rescue Puppet::ExecutionFailure => detail
-            self.fail "Could not unconfigure zone: %s" % detail
-        end
-    end
-
-    def uninstall
-        begin
-            execute("/usr/sbin/zoneadm -z #{self[:name]} uninstall -F")
-        rescue Puppet::ExecutionFailure => detail
-            self.fail "Could not halt zone: %s" % detail
-        end
     end
 
     private
-
     # Turn the results of getconfig into status information.
     def config2status(config)
         config.each do |name, value|
@@ -530,6 +421,8 @@ set zonepath=%s
                 # Nothing; this is set in the zoneadm list command
             when :pool:
                 self.is = [:pool, value]
+            when :shares:
+                self.is = [:shares, value]
             when "inherit-pkg-dir":
                 dirs = value.collect do |hash|
                     hash[:dir]
@@ -544,52 +437,6 @@ set zonepath=%s
             end
         end
     end
-
-    # Collect the configuration of the zone.
-    def getconfig
-        output = execute("/usr/sbin/zonecfg -z %s info" % self[:name])
-
-        name = nil
-        current = nil
-        hash = {}
-        output.split("\n").each do |line|
-            case line
-            when /^(\S+):\s*$/:
-                name = $1
-                current = nil # reset it
-            when /^(\S+):\s*(.+)$/:
-                hash[$1.intern] = $2
-                #self.is = [$1.intern, $2]
-            when /^\s+(\S+):\s*(.+)$/:
-                if name
-                    unless hash.include? name
-                        hash[name] = []
-                    end
-
-                    unless current
-                        current = {}
-                        hash[name] << current
-                    end
-                    current[$1.intern] = $2
-                else
-                    err "Ignoring '%s'" % line
-                end
-            else
-                debug "Ignoring zone output '%s'" % line
-            end
-        end
-        config2status(hash)
-    end
-
-    def statushash
-        begin
-            output = execute("/usr/sbin/zoneadm -z #{self[:name]} list -p 2>/dev/null")
-        rescue Puppet::ExecutionFailure => detail
-            return nil
-        end
-
-        return self.class.line2hash(output.chomp)
-    end
 end
 
-# $Id: zone.rb 1386 2006-07-11 18:38:42Z luke $
+# $Id: zone.rb 2408 2007-04-24 02:41:16Z luke $