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

Fix Fedora 21+ package name

Browse Source 
java-1.7.0-openjdk is no longer available in Fedora 21+
This commit is contained in:
Scott K Logan
2015-01-31 22:47:19 -08:00
parent b01d529af3
commit 98447f03e7
2 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
manifests/params.pp
View File

@@ -30,8 +30,14 @@ class java::params {
}
}
'Fedora': {
$jdk_package = 'java-1.7.0-openjdk-devel'
$jre_package = 'java-1.7.0-openjdk'
if (versioncmp($::operatingsystemrelease, '21') < 0) {
$jdk_package = 'java-1.7.0-openjdk-devel'
$jre_package = 'java-1.7.0-openjdk'
}
else {
$jdk_package = 'java-1.8.0-openjdk-devel'
$jre_package = 'java-1.8.0-openjdk'
}
}
'Amazon': {
$jdk_package = 'java-1.7.0-openjdk-devel'