Moves debain packages to openjdk.

Change sun-java6-* packages to their openjdk equivalents and add conditional
  based on lsb codename to determine which version to install.
This commit is contained in:
Cody Herriges
2012-05-09 15:43:19 -07:00
parent 6365fcd9f2
commit 30b07259a2
2 changed files with 17 additions and 9 deletions

View File

@@ -37,10 +37,24 @@ class java(
debian, ubuntu: { debian, ubuntu: {
$distribution_debian = $distribution ? { case $lsbdistcodename {
jdk => 'sun-java6-jdk', squeeze, lucid: {
jre => 'sun-java6-jre', $distribution_debian = $distribution ? {
jdk => 'openjdk-6-jdk',
jre => 'openjdk-6-jre-headless',
}
}
wheezy, precise: {
$distribution_debian = $distribution ? {
jdk => 'openjdk-7-jdk',
jre => 'openjdk-7-jre-headless',
}
}
default: {
fail("operatingsystem distribution $lsbdistcodename is not supported")
}
} }
class { 'java::package_debian': class { 'java::package_debian':
version => $version, version => $version,
distribution => $distribution_debian, distribution => $distribution_debian,

View File

@@ -20,14 +20,8 @@ class java::package_debian(
$distribution $distribution
) { ) {
file { "/var/local/sun-java6.preseed":
content => template("${module_name}/sun-java6.preseed"),
}
package { 'java': package { 'java':
ensure => $version, ensure => $version,
name => $distribution, name => $distribution,
responsefile => "/var/local/sun-java6.preseed",
require => File["/var/local/sun-java6.preseed"],
} }
} }