Merge pull request #14 from eshamow/use_osfamily_instead_of_operatingsystem

Use osfamily instead of operatingsystem to determine package
This commit is contained in:
Chris Price
2012-10-18 19:10:37 -07:00

View File

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