diff --git a/manifests/params.pp b/manifests/params.pp index 09981db..a494884 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -44,8 +44,17 @@ class java::params { $jre_package = 'runtime/java/jre-7' } 'Suse': { - $jdk_package = 'java-1_6_0-ibm-devel' - $jre_package = 'java-1_6_0-ibm' + case $::operatingsystem { + default: { + $jdk_package = 'java-1_6_0-ibm-devel' + $jre_package = 'java-1_6_0-ibm' + } + + 'OpenSuSE': { + $jdk_package = 'java-1_7_0-openjdk-devel' + $jre_package = 'java-1_7_0-openjdk' + } + } } } diff --git a/spec/classes/java_spec.rb b/spec/classes/java_spec.rb index 5e802c9..b2b399c 100644 --- a/spec/classes/java_spec.rb +++ b/spec/classes/java_spec.rb @@ -28,4 +28,9 @@ describe 'java', :type => :class do it { should contain_package('java').with_name('java-1.6.0-openjdk-devel') } end + context 'select default for OpenSUSE 12.3' do + let(:facts) { {:osfamily => 'Suse', :operatingsystem => 'OpenSUSE', :operatingsystemrelease => '12.3'}} + it { should contain_package('java').with_name('java-1_7_0-openjdk-devel')} + end + end