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

Update SLES 11sp4 packages to Java 1.7.1 (#178)

Browse Source
This commit is contained in:
Tyler Langlois
2016-12-23 06:36:22 -05:00
committed by TP Honey
parent 37e799a35c
commit 70b6b81ec9
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/params.pp
View File

@@ -216,8 +216,8 @@ class java::params {
$jre_package = 'java-1_7_0-openjdk' $jre_package = 'java-1_7_0-openjdk'
$java_home = '/usr/lib64/jvm/java-1.7.0-openjdk-1.7.0/' $java_home = '/usr/lib64/jvm/java-1.7.0-openjdk-1.7.0/'
} elsif (versioncmp($::operatingsystemrelease, '11.4') >= 0) { } elsif (versioncmp($::operatingsystemrelease, '11.4') >= 0) {
$jdk_package = 'java-1_7_0-ibm-devel' $jdk_package = 'java-1_7_1-ibm-devel'
$jre_package = 'java-1_7_0-ibm' $jre_package = 'java-1_7_1-ibm'
$java_home = '/usr/lib64/jvm/java-1.7.0-ibm-1.7.0/' $java_home = '/usr/lib64/jvm/java-1.7.0-ibm-1.7.0/'
} else { } else {
$jdk_package = 'java-1_6_0-ibm-devel' $jdk_package = 'java-1_6_0-ibm-devel'

2
spec/classes/java_spec.rb
View File

@@ -210,7 +210,7 @@ describe 'java', :type => :class do
context 'select default for SLES 11.4' do context 'select default for SLES 11.4' do
let(:facts) { {:osfamily => 'Suse', :operatingsystem => 'SLES', :operatingsystemrelease => '11.4', :architecture => 'x86_64'}} let(:facts) { {:osfamily => 'Suse', :operatingsystem => 'SLES', :operatingsystemrelease => '11.4', :architecture => 'x86_64'}}
it { should contain_package('java').with_name('java-1_7_0-ibm-devel')} it { should contain_package('java').with_name('java-1_7_1-ibm-devel')}
it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib64/jvm/java-1.7.0-ibm-1.7.0/') } it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib64/jvm/java-1.7.0-ibm-1.7.0/') }
end end