diff --git a/manifests/params.pp b/manifests/params.pp index 5b5a80a..50779ec 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -15,7 +15,7 @@ class java::params { case $::osfamily { 'RedHat': { case $::operatingsystem { - 'RedHat', 'CentOS', 'OracleLinux', 'Scientific', 'OEL': { + 'RedHat', 'CentOS', 'OracleLinux', 'Scientific', 'OEL', 'SLC': { if (versioncmp($::operatingsystemrelease, '5.0') < 0) { $jdk_package = 'java-1.6.0-sun-devel' $jre_package = 'java-1.6.0-sun' diff --git a/spec/classes/java_spec.rb b/spec/classes/java_spec.rb index 7d096cc..c311bd2 100644 --- a/spec/classes/java_spec.rb +++ b/spec/classes/java_spec.rb @@ -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/') } 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 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')}