summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Turnbull <james@lovedthanlost.net>2009-02-13 17:04:36 +1100
committerJames Turnbull <james@lovedthanlost.net>2009-02-13 17:04:36 +1100
commit2218611f7fa10b59945f65c80b05cbd8ebe137ef (patch)
tree85969297edf38126bd5267139e9e4b15adf2ca8d
parent39a8b28690377339d4c430ebf62cec5ef0ed34b8 (diff)
downloadpuppet-2218611f7fa10b59945f65c80b05cbd8ebe137ef.tar.gz
puppet-2218611f7fa10b59945f65c80b05cbd8ebe137ef.tar.xz
puppet-2218611f7fa10b59945f65c80b05cbd8ebe137ef.zip
Updated up2date and service confines to add support for Oracle EL and VM
-rw-r--r--CHANGELOG2
-rw-r--r--lib/puppet/provider/package/up2date.rb6
-rwxr-xr-xlib/puppet/provider/service/redhat.rb2
3 files changed, 7 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 329e700f7..a8e828793 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,6 @@
0.24.8
+ Updated up2date and service confines to add support for Oracle EL and VM
+
Fixing #1948 and #1953 - augeas ins bug: wrong number of arguments (1 for 3)
Fixing #944 - changing error message from warning to info - connection recycled
diff --git a/lib/puppet/provider/package/up2date.rb b/lib/puppet/provider/package/up2date.rb
index dde633db4..8a1c22892 100644
--- a/lib/puppet/provider/package/up2date.rb
+++ b/lib/puppet/provider/package/up2date.rb
@@ -3,9 +3,11 @@ Puppet.type(:package).provide :up2date, :parent => :rpm, :source => :rpm do
mechanism."
commands :up2date => "/usr/sbin/up2date-nox"
- defaultfor :operatingsystem => :redhat,
+
+ defaultfor :operatingsystem => [:redhat, :oel, :ovm]
:lsbdistrelease => ["2.1", "3", "4"]
- confine :operatingsystem => :redhat
+
+ confine :operatingsystem => [:redhat, :oel, :ovm]
# Install a package using 'up2date'.
def install
diff --git a/lib/puppet/provider/service/redhat.rb b/lib/puppet/provider/service/redhat.rb
index c6c3540f5..031db46c1 100755
--- a/lib/puppet/provider/service/redhat.rb
+++ b/lib/puppet/provider/service/redhat.rb
@@ -9,7 +9,7 @@ Puppet::Type.type(:service).provide :redhat, :parent => :init do
commands :chkconfig => "/sbin/chkconfig", :service => "/sbin/service"
- defaultfor :operatingsystem => [:redhat, :fedora, :suse, :centos, :sles]
+ defaultfor :operatingsystem => [:redhat, :fedora, :suse, :centos, :sles, :oel, :ovm]
def self.defpath
superclass.defpath