RickRongen/puppetlabs-java
1
0
Fork 0
Code Releases Activity

Use osfamily instead of operatingsystem to determine package

Browse Source 
osfamily is slightly more forgiving, especially for RHEL-based
distributions.
This commit is contained in:
Eric Shamow
2012-07-10 15:50:27 -06:00
parent 4d7154516d
commit 3afa0813ea
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
manifests/init.pp
View File

@@ -22,9 +22,9 @@ class java(
anchor { 'java::begin': } anchor { 'java::begin': }
anchor { 'java::end': } anchor { 'java::end': }
case $operatingsystem { case $::osfamily {
centos, redhat, oel: { 'RedHat': {
class { 'java::package_redhat': class { 'java::package_redhat':
version => $version, version => $version,
@@ -35,9 +35,9 @@ class java(
} }
debian, ubuntu: { 'Debian': {
case $lsbdistcodename { case $::lsbdistcodename {
squeeze, lucid: { squeeze, lucid: {
$distribution_debian = $distribution ? { $distribution_debian = $distribution ? {
jdk => 'openjdk-6-jdk', jdk => 'openjdk-6-jdk',
@@ -51,7 +51,7 @@ class java(
} }
} }
default: { default: {
fail("operatingsystem distribution ${lsbdistcodename} is not supported") fail("operatingsystem distribution ${::lsbdistcodename} is not supported")
} }
} }
@@ -65,7 +65,7 @@ class java(
} }
default: { default: {
fail("operatingsystem ${operatingsystem} is not supported") fail("osfamily ${::osfamily} is not supported")
} }
} }