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

Merge branch 'fixes_for_centos_versions' of https://github.com/garethr/puppetlabs-java into garethr-fixes_for_centos_versions

Browse Source 
Conflicts:
	Modulefile
	README.markdown
	manifests/init.pp
	spec/spec_helper.rb
This commit is contained in:
Brett Porter
2013-06-02 21:26:10 -07:00
parent 44280b3535 f5ee99f297
commit cde7046e99
9 changed files with 109 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
manifests/params.pp
View File

@@ -11,8 +11,14 @@ class java::params {
case $::operatingsystem {
default: { fail("unsupported os ${::operatingsystem}") }
'RedHat', 'CentOS': {
$jdk_package = 'java-1.7.0-openjdk-devel'
$jre_package = 'java-1.7.0-openjdk'
if (versioncmp($::operatingsystemrelease, '6.3') < 0) {
$jdk_package = 'java-1.6.0-openjdk-devel'
$jre_package = 'java-1.6.0-openjdk'
}
else {
$jdk_package = 'java-1.7.0-openjdk-devel'
$jre_package = 'java-1.7.0-openjdk'
}
}
'Fedora': {
$jdk_package = 'java'