From 3556af3a494db8c27bc09a21ba5a880ccbd1ce4a Mon Sep 17 00:00:00 2001 From: Matthaus Owens Date: Thu, 1 Aug 2013 12:15:08 -0700 Subject: [PATCH 1/2] Trailing whitespace cleanup. --- spec/classes/java_spec.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spec/classes/java_spec.rb b/spec/classes/java_spec.rb index b78e317..22b2019 100644 --- a/spec/classes/java_spec.rb +++ b/spec/classes/java_spec.rb @@ -27,13 +27,13 @@ describe 'java', :type => :class do context 'select default for Centos 5.3' do let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Centos', :operatingsystemrelease => '5.3'} } it { should contain_package('java').with_name('java-1.6.0-openjdk-devel') } - it { should_not contain_exec('update-java-alternatives') } + it { should_not contain_exec('update-java-alternatives') } end context 'select default for Debian Wheezy' do let(:facts) { {:osfamily => 'Debian', :operatingsystem => 'Debian', :lsbdistcodename => 'wheezy', :operatingsystemrelease => '7.1', :architecture => 'amd64',} } it { should contain_package('java').with_name('openjdk-7-jdk') } - it { should contain_exec('update-java-alternatives').with_command('update-java-alternatives --set java-1.7.0-openjdk-amd64 --jre') } + it { should contain_exec('update-java-alternatives').with_command('update-java-alternatives --set java-1.7.0-openjdk-amd64 --jre') } end context 'select Oracle JRE for Debian Wheezy' do @@ -46,7 +46,7 @@ describe 'java', :type => :class do context 'select default for Debian Squeeze' do let(:facts) { {:osfamily => 'Debian', :operatingsystem => 'Debian', :lsbdistcodename => 'squeeze', :operatingsystemrelease => '6.0.5'} } it { should contain_package('java').with_name('openjdk-6-jdk') } - it { should contain_exec('update-java-alternatives').with_command('update-java-alternatives --set java-6-openjdk --jre') } + it { should contain_exec('update-java-alternatives').with_command('update-java-alternatives --set java-6-openjdk --jre') } end context 'select Oracle JRE for Debian Squeeze' do From bf7edcf2992e8f3f2082464c392f0d181780f21e Mon Sep 17 00:00:00 2001 From: Matthaus Owens Date: Thu, 1 Aug 2013 12:15:12 -0700 Subject: [PATCH 2/2] Update java packages for Fedora systems The java package on Fedora is currently java-1.7.0-openjdk for their basic java, and java-1.7.0-openjdk-devel for a development set. Fedora 16 had java-1.6.0-openjdk, but it has been EOL for a long time. This commit updates the default java for Fedora to the 1.7.0 package. --- manifests/params.pp | 4 ++-- spec/classes/java_spec.rb | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/manifests/params.pp b/manifests/params.pp index 22569d3..5f8f81b 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -32,8 +32,8 @@ class java::params { } } 'Fedora': { - $jdk_package = 'java' - $jre_package = 'java' + $jdk_package = 'java-1.7.0-openjdk-devel' + $jre_package = 'java-1.7.0-openjdk' } 'Amazon': { $jdk_package = 'java-1.7.0-openjdk-devel' diff --git a/spec/classes/java_spec.rb b/spec/classes/java_spec.rb index 22b2019..d77e657 100644 --- a/spec/classes/java_spec.rb +++ b/spec/classes/java_spec.rb @@ -17,6 +17,17 @@ describe 'java', :type => :class do it { should contain_package('java').with_name('java-1.6.0-openjdk-devel') } end + context 'select openjdk for Fedora' do + let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Fedora'} } + it { should contain_package('java').with_name('java-1.7.0-openjdk-devel') } + end + + context 'select passed value for Fedora' do + let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Fedora'} } + let(:params) { { 'distribution' => 'jre' } } + it { should contain_package('java').with_name('java-1.7.0-openjdk') } + end + context 'select passed value for Centos 5.3' do let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Centos', :operatingsystemrelease => '5.3'} } let(:params) { { 'package' => 'jdk' } }