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

Use java 8 as the default on RHEL > 7.0

Browse Source
This commit is contained in:
Joseph Yaworski
2016-02-24 13:33:13 -05:00
parent a2e4898550
commit c8e46b5db2
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/params.pp
View File

@@ -24,10 +24,14 @@ class java::params {
$jdk_package = 'java-1.6.0-openjdk-devel' $jdk_package = 'java-1.6.0-openjdk-devel'
$jre_package = 'java-1.6.0-openjdk' $jre_package = 'java-1.6.0-openjdk'
} }
else { elsif (versioncmp($::operatingsystemrelease, '7.1') < 0) {
$jdk_package = 'java-1.7.0-openjdk-devel' $jdk_package = 'java-1.7.0-openjdk-devel'
$jre_package = 'java-1.7.0-openjdk' $jre_package = 'java-1.7.0-openjdk'
} }
else {
$jdk_package = 'java-1.8.0-openjdk-devel'
$jre_package = 'java-1.8.0-openjdk'
}
} }
'Fedora': { 'Fedora': {
if (versioncmp($::operatingsystemrelease, '21') < 0) { if (versioncmp($::operatingsystemrelease, '21') < 0) {

5
spec/classes/java_spec.rb
View File

@@ -12,6 +12,11 @@ describe 'java', :type => :class do
it { should contain_package('java').with_name('java-1.7.0-openjdk-devel') } it { should contain_package('java').with_name('java-1.7.0-openjdk-devel') }
end end
context 'select openjdk for Centos 7.1.1503' do
let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Centos', :operatingsystemrelease => '7.1.1503'} }
it { should contain_package('java').with_name('java-1.8.0-openjdk-devel') }
end
context 'select openjdk for Centos 6.2' do context 'select openjdk for Centos 6.2' do
let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Centos', :operatingsystemrelease => '6.2'} } let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Centos', :operatingsystemrelease => '6.2'} }
it { should contain_package('java').with_name('java-1.6.0-openjdk-devel') } it { should contain_package('java').with_name('java-1.6.0-openjdk-devel') }