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

(maint) Update java_home for redhat systems

Browse Source 
It appears that redhat 7 and variants no longer have
java-1.7.0-openjdk-$arch symlinks. All redhat 6/7's both 32 and 64 bit
seem to include a java-1.7.0 symlink though.
This commit is contained in:
Hunter Haugen
2017-06-09 11:43:03 -07:00
parent 49369bd48c
commit e234375924
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/params.pp
View File

@@ -21,20 +21,22 @@ class java::params {
$jre_package = 'java-1.6.0-sun'
$java_home = '/usr/lib/jvm/java-1.6.0-sun/jre/'
}
# See cde7046 for why >= 5.0 < 6.3
elsif (versioncmp($::operatingsystemrelease, '6.3') < 0) {
$jdk_package = 'java-1.6.0-openjdk-devel'
$jre_package = 'java-1.6.0-openjdk'
$java_home = "/usr/lib/jvm/java-1.6.0-openjdk-${::architecture}/"
$java_home = '/usr/lib/jvm/java-1.6.0/'
}
# See PR#160 / c8e46b5 for why >= 6.3 < 7.1
elsif (versioncmp($::operatingsystemrelease, '7.1') < 0) {
$jdk_package = 'java-1.7.0-openjdk-devel'
$jre_package = 'java-1.7.0-openjdk'
$java_home = "/usr/lib/jvm/java-1.7.0-openjdk-${::architecture}/"
$java_home = '/usr/lib/jvm/java-1.7.0/'
}
else {
$jdk_package = 'java-1.8.0-openjdk-devel'
$jre_package = 'java-1.8.0-openjdk'
$java_home = "/usr/lib/jvm/java-1.8.0-openjdk-${::architecture}/"
$java_home = '/usr/lib/jvm/java-1.8.0/'
}
}
'Fedora': {