Updating Puppet to work with the new Facter

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@794 980ebf18-57e1-0310-9a29-db15c13687c0

8 files changed, 37 insertions, 48 deletions

diff --git a/Rakefile b/Rakefile
index 3a24fbc62..07ba94ebd 100644
--- a/Rakefile
+++ b/Rakefile
@@ -38,7 +38,7 @@ DOWNDIR = "/export/docroots/reductivelabs.com/htdocs/downloads"
 if ENV['HOSTS']
     TESTHOSTS = ENV['HOSTS'].split(/\s+/)
 else
-    TESTHOSTS = %w{fedora1 rh3a kirby culain}
+    TESTHOSTS = %w{fedora1 rh3a kirby culain openbsd1}
 end
 #TESTHOSTS = %w{sol10b}
 
@@ -147,7 +147,7 @@ the configuration.
         # I'd love to explicitly list all of the libraries that I need,
         # but gems seem to only be able to handle dependencies on other
         # gems, which is, um, stupid.
-        s.add_dependency('facter', '>= 1.0.1')
+        s.add_dependency('facter', '>= 1.1.0')
         #s.requirements << ""
 
         s.files = PKG_FILES.to_a
diff --git a/lib/puppet/type/cron.rb b/lib/puppet/type/cron.rb
index 9e10ae01b..bc9fd6566 100755
--- a/lib/puppet/type/cron.rb
+++ b/lib/puppet/type/cron.rb
@@ -332,7 +332,7 @@ module Puppet
         @instances = {}
 
         case Facter["operatingsystem"].value
-        when "SunOS":
+        when "Solaris":
             @crontype = Puppet::CronType::SunOS
         else
             @crontype = Puppet::CronType::Default
diff --git a/lib/puppet/type/nameservice/objectadd.rb b/lib/puppet/type/nameservice/objectadd.rb
index df2a94902..ea6fc2313 100644
--- a/lib/puppet/type/nameservice/objectadd.rb
+++ b/lib/puppet/type/nameservice/objectadd.rb
@@ -103,7 +103,7 @@ module Puppet
                         cmd << state.class.objectaddflag << "'%s'" % state.should
                     }
                     # stupid fedora
-                    case Facter["distro"].value
+                    case Facter["operatingsystem"].value
                     when "Fedora", "RedHat":
                         cmd << "-M"
                     else
diff --git a/lib/puppet/type/package.rb b/lib/puppet/type/package.rb
index 24246f908..5f1c37939 100644
--- a/lib/puppet/type/package.rb
+++ b/lib/puppet/type/package.rb
@@ -228,22 +228,23 @@ module Puppet
                 )
             end
             case @platform
-            when "sunos": @default = :sun
-            when "linux":
-                case Facter["distro"].value.downcase
-                when "gentoo":
-                    Puppet.notice "No support for gentoo yet"
+            when "solaris": @default = :sun
+            when "gentoo":
+                Puppet.notice "No support for gentoo yet"
+                @default = nil
+            when "debian": @default = :apt
+            when "fedora": @default = :yum
+            when "redhat": @default = :rpm
+            else
+                if Facter["kernel"] == "Linux"
+                    Puppet.warning "Defaulting to RPM for %s" %
+                        Facter["operatingsystem"].value
                     @default = nil
-                when "debian": @default = :apt
-                when "fedora": @default = :yum
-                when "redhat": @default = :rpm
                 else
-                    Puppet.warning "Using rpm as default type for %s" %
-                        Facter["distro"].value
-                    @default = :rpm
+                    Puppet.warning "No default package system for %s" %
+                        Facter["operatingsystem"].value
+                    @default = nil
                 end
-            else
-                @default = nil
             end
         end
 
diff --git a/lib/puppet/type/service.rb b/lib/puppet/type/service.rb
index d8c4c6bd2..76bc8adb1 100644
--- a/lib/puppet/type/service.rb
+++ b/lib/puppet/type/service.rb
@@ -244,20 +244,21 @@ module Puppet
                 @defsvctype = nil
                 os = Facter["operatingsystem"].value
                 case os
-                when "Linux":
-                    case Facter["distro"].value
-                    when "Debian":
-                        @defsvctype = self.svctype(:debian)
-                    else
-                        @defsvctype = self.svctype(:init)
-                    end
-                when "SunOS":
+                when "Debian":
+                    @defsvctype = self.svctype(:debian)
+                when "Solaris":
                     release = Facter["operatingsystemrelease"].value
-                    if release.sub(/5\./,'').to_f < 10
+                    if release.sub(/5\./,'').to_i < 10
                         @defsvctype = self.svctype(:init)
                     else
                         @defsvctype = self.svctype(:smf)
                     end
+                else
+                    if Facter["kernel"] == "Linux"
+                        Puppet.notice "Using service type %s for %s" %
+                            ["init", Facter["operatingsystem"].value]
+                        @defsvctype = self.svctype(:init)
+                    end
                 end
 
                 unless @defsvctype
diff --git a/test/types/group.rb b/test/types/group.rb
index 5ea2d797d..c0ec32de6 100755
--- a/test/types/group.rb
+++ b/test/types/group.rb
@@ -220,7 +220,7 @@ class TestGroup < Test::Unit::TestCase
             comp = nil
             name = "pptestgr"
 
-            os = Facter["operatingsystem"].value
+            #os = Facter["operatingsystem"].value
 
             #if os == "Darwin"
             #    obj = nil
diff --git a/test/types/package.rb b/test/types/package.rb
index 625763d80..908aa52bd 100644
--- a/test/types/package.rb
+++ b/test/types/package.rb
@@ -41,15 +41,8 @@ class TestPackages < Test::Unit::TestCase
         case $platform
         when "SunOS"
             pkgs = %w{SMCossh}
-        when "Linux"
-            case Facter["distro"].value
-            when "Debian": pkgs = %w{ssh openssl}
-            when "Fedora": pkgs = %w{openssh}
-            #when "RedHat": type = :rpm
-            else
-                Puppet.notice "No test package for %s" % $platform 
-                return []
-            end
+        when "Debian": pkgs = %w{ssh openssl}
+        when "Fedora": pkgs = %w{openssh}
         else
             Puppet.notice "No test package for %s" % $platform
             return []
@@ -62,17 +55,11 @@ class TestPackages < Test::Unit::TestCase
         case $platform
         #when "SunOS"
         #    type = "sunpkg"
-        when "Linux"
-            case Facter["distro"].value
-            when "Debian":
-                return %w{zec}
-            #when "RedHat": type = :rpm
-            when "Fedora":
-                return %w{wv}
-            else
-                Puppet.notice "No test packags for %s" % $platform
-                return nil
-            end
+        when "Debian":
+            return %w{zec}
+        #when "RedHat": type = :rpm
+        when "Fedora":
+            return %w{wv}
         else
             Puppet.notice "No test packags for %s" % $platform
             return nil
diff --git a/test/types/service.rb b/test/types/service.rb
index cca3b2176..09971181d 100644
--- a/test/types/service.rb
+++ b/test/types/service.rb
@@ -10,7 +10,7 @@ require 'test/unit'
 
 $skipsvcs = false
 case Facter["operatingsystem"].value
-when "Darwin": $skipsvcs = true
+when "Darwin", "OpenBSD": $skipsvcs = true
 end
 
 if $skipsvcs