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

Merge pull request #104 from cottsay/master

Browse Source 
Fix Fedora 21+ package name
This commit is contained in:
Morgan Haskel
2015-02-06 18:46:22 +01:00
parent 1a53dd3ff4 98447f03e7
commit 97b48f12d1
2 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
manifests/params.pp
View File

@@ -30,8 +30,14 @@ class java::params {
} }
} }
'Fedora': { 'Fedora': {
$jdk_package = 'java-1.7.0-openjdk-devel' if (versioncmp($::operatingsystemrelease, '21') < 0) {
$jre_package = 'java-1.7.0-openjdk' $jdk_package = 'java-1.7.0-openjdk-devel'
$jre_package = 'java-1.7.0-openjdk'
}
else {
$jdk_package = 'java-1.8.0-openjdk-devel'
$jre_package = 'java-1.8.0-openjdk'
}
} }
'Amazon': { 'Amazon': {
$jdk_package = 'java-1.7.0-openjdk-devel' $jdk_package = 'java-1.7.0-openjdk-devel'

19
spec/classes/java_spec.rb
View File

@@ -26,17 +26,28 @@ describe 'java', :type => :class do
it { should contain_exec('update-java-alternatives').with_command('alternatives --set java /usr/java/jre1.7.0_67/bin/java') } it { should contain_exec('update-java-alternatives').with_command('alternatives --set java /usr/java/jre1.7.0_67/bin/java') }
end end
context 'select openjdk for Fedora' do context 'select openjdk for Fedora 20' do
let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Fedora'} } let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Fedora', :operatingsystemrelease => '20'} }
it { should contain_package('java').with_name('java-1.7.0-openjdk-devel') } it { should contain_package('java').with_name('java-1.7.0-openjdk-devel') }
end end
context 'select passed value for Fedora' do context 'select openjdk for Fedora 21' do
let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Fedora'} } let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Fedora', :operatingsystemrelease => '21'} }
it { should contain_package('java').with_name('java-1.8.0-openjdk-devel') }
end
context 'select passed value for Fedora 20' do
let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Fedora', :operatingsystemrelease => '20'} }
let(:params) { { 'distribution' => 'jre' } } let(:params) { { 'distribution' => 'jre' } }
it { should contain_package('java').with_name('java-1.7.0-openjdk') } it { should contain_package('java').with_name('java-1.7.0-openjdk') }
end end
context 'select passed value for Fedora 21' do
let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Fedora', :operatingsystemrelease => '21'} }
let(:params) { { 'distribution' => 'jre' } }
it { should contain_package('java').with_name('java-1.8.0-openjdk') }
end
context 'select passed value for Centos 5.3' do context 'select passed value for Centos 5.3' do
let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Centos', :operatingsystemrelease => '5.3'} } let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Centos', :operatingsystemrelease => '5.3'} }
let(:params) { { 'package' => 'jdk' } } let(:params) { { 'package' => 'jdk' } }