From 30b07259a26c1dbee44221a59ddcee2b9308c8ac Mon Sep 17 00:00:00 2001 From: Cody Herriges Date: Wed, 9 May 2012 15:43:19 -0700 Subject: [PATCH] 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. --- manifests/init.pp | 20 +++++++++++++++++--- manifests/package_debian.pp | 6 ------ 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 6a303b9..ad74b80 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -37,10 +37,24 @@ class java( debian, ubuntu: { - $distribution_debian = $distribution ? { - jdk => 'sun-java6-jdk', - jre => 'sun-java6-jre', + case $lsbdistcodename { + squeeze, lucid: { + $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': version => $version, distribution => $distribution_debian, diff --git a/manifests/package_debian.pp b/manifests/package_debian.pp index 89ad88b..565399d 100644 --- a/manifests/package_debian.pp +++ b/manifests/package_debian.pp @@ -20,14 +20,8 @@ class java::package_debian( $distribution ) { - file { "/var/local/sun-java6.preseed": - content => template("${module_name}/sun-java6.preseed"), - } package { 'java': ensure => $version, name => $distribution, - responsefile => "/var/local/sun-java6.preseed", - require => File["/var/local/sun-java6.preseed"], } - }