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

Merge pull request #171 from jonnytpuppet/tylerjl/sles-11.4-java

Browse Source 
Update java package for SLES 11.4
This commit is contained in:
JT (Jonny)
2016-05-10 11:33:44 +01:00
parent f4d218a162 4b5cbc4d33
commit 519e2d7b77
2 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
manifests/params.pp
View File

@@ -164,15 +164,15 @@ class java::params {
'Suse': { 'Suse': {
case $::operatingsystem { case $::operatingsystem {
'SLES': { 'SLES': {
case $::operatingsystemmajrelease{ if (versioncmp($::operatingsystemrelease, '12') >= 0) {
default: { $jdk_package = 'java-1_7_0-openjdk-devel'
$jdk_package = 'java-1_6_0-ibm-devel' $jre_package = 'java-1_7_0-openjdk'
$jre_package = 'java-1_6_0-ibm' } elsif (versioncmp($::operatingsystemrelease, '11.4') >= 0) {
} $jdk_package = 'java-1_7_0-ibm-devel'
'12': { $jre_package = 'java-1_7_0-ibm'
$jdk_package = 'java-1_7_0-openjdk-devel' } else {
$jre_package = 'java-1_7_0-openjdk' $jdk_package = 'java-1_6_0-ibm-devel'
} $jre_package = 'java-1_6_0-ibm'
} }
} }
'OpenSuSE': { 'OpenSuSE': {

15
spec/classes/java_spec.rb
View File

@@ -170,6 +170,21 @@ describe 'java', :type => :class do
it { is_expected.to contain_package('java').with_name('java-1_7_0-openjdk-devel')} it { is_expected.to contain_package('java').with_name('java-1_7_0-openjdk-devel')}
end end
context 'select default for SLES 11.3' do
let(:facts) { {:osfamily => 'Suse', :operatingsystem => 'SLES', :operatingsystemrelease => '11.3'}}
it { should contain_package('java').with_name('java-1_6_0-ibm-devel')}
end
context 'select default for SLES 11.4' do
let(:facts) { {:osfamily => 'Suse', :operatingsystem => 'SLES', :operatingsystemrelease => '11.4'}}
it { should contain_package('java').with_name('java-1_7_0-ibm-devel')}
end
context 'select default for SLES 12.1' do
let(:facts) { {:osfamily => 'Suse', :operatingsystem => 'SLES', :operatingsystemrelease => '12.1', :operatingsystemmajrelease => '12'}}
it { should contain_package('java').with_name('java-1_7_0-openjdk-devel')}
end
context 'select jdk for OpenBSD' do context 'select jdk for OpenBSD' do
let(:facts) { {:osfamily => 'OpenBSD'} } let(:facts) { {:osfamily => 'OpenBSD'} }
it { is_expected.to contain_package('java').with_name('jdk') } it { is_expected.to contain_package('java').with_name('jdk') }