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

Merge pull request #217 from traylenator/slc

Browse Source 
Support SLC operatingsystem
This commit is contained in:
Wilson McCoubrey
2017-03-16 14:08:20 +00:00
committed by GitHub
parent ebb30f1ef5 580d875b9a
commit 16e369ef21
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/params.pp
View File

@@ -15,7 +15,7 @@ class java::params {
case $::osfamily { case $::osfamily {
'RedHat': { 'RedHat': {
case $::operatingsystem { case $::operatingsystem {
'RedHat', 'CentOS', 'OracleLinux', 'Scientific', 'OEL': { 'RedHat', 'CentOS', 'OracleLinux', 'Scientific', 'OEL', 'SLC': {
if (versioncmp($::operatingsystemrelease, '5.0') < 0) { if (versioncmp($::operatingsystemrelease, '5.0') < 0) {
$jdk_package = 'java-1.6.0-sun-devel' $jdk_package = 'java-1.6.0-sun-devel'
$jre_package = 'java-1.6.0-sun' $jre_package = 'java-1.6.0-sun'

7
spec/classes/java_spec.rb
View File

@@ -196,6 +196,13 @@ describe 'java', :type => :class do
it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-x86_64/') } it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-x86_64/') }
end end
context 'select passed value for Scientific Linux CERN (SLC)' do
let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'SLC', :operatingsystemrelease => '6.4', :architecture => 'x86_64'} }
let(:params) { { 'distribution' => 'jre' } }
it { is_expected.to contain_package('java').with_name('java-1.7.0-openjdk') }
it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-x86_64/') }
end
context 'select default for OpenSUSE 12.3' do context 'select default for OpenSUSE 12.3' do
let(:facts) { {:osfamily => 'Suse', :operatingsystem => 'OpenSUSE', :operatingsystemrelease => '12.3', :architecture => 'x86_64'}} let(:facts) { {:osfamily => 'Suse', :operatingsystem => 'OpenSUSE', :operatingsystemrelease => '12.3', :architecture => 'x86_64'}}
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')}