From 99ea38f22ffd3f995f991e44de77794d69639955 Mon Sep 17 00:00:00 2001 From: Ossi Salmi Date: Mon, 14 Mar 2016 15:20:16 +0200 Subject: [PATCH] openjdk: Make package version configurable --- openjdk/manifests/init.pp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/openjdk/manifests/init.pp b/openjdk/manifests/init.pp index 09333f5..3156a3f 100644 --- a/openjdk/manifests/init.pp +++ b/openjdk/manifests/init.pp @@ -1,15 +1,15 @@ # Install OpenJDK development environment. # -class openjdk::jdk { +class openjdk::jdk($version='7') { case $::operatingsystem { 'centos','redhat': { - package { 'java-1.7.0-openjdk-devel': + package { "java-1.${version}.0-openjdk-devel": ensure => installed, } } 'ubuntu': { - package { 'openjdk-7-jdk': + package { "openjdk-${version}-jdk": ensure => installed, } } @@ -23,16 +23,16 @@ class openjdk::jdk { # Install OpenJDK runtime environment. # -class openjdk::jre { +class openjdk::jre($version='7') { case $::operatingsystem { 'centos','redhat': { - package { 'java-1.7.0-openjdk': + package { "java-1.${version}.0-openjdk": ensure => installed, } } 'ubuntu': { - package { 'openjdk-7-jre': + package { "openjdk-${version}-jre": ensure => installed, } }