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

Added support Amazon Linux using facter >= 1.7.x. Fixes 1.

Browse Source
This commit is contained in:
Martin Jackson
2013-06-20 11:03:01 +01:00
parent d531f47e8f
commit 9fcf5d1a23
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/params.pp
View File

@@ -24,6 +24,10 @@ class java::params {
$jdk_package = 'java' $jdk_package = 'java'
$jre_package = 'java' $jre_package = 'java'
} }
'Amazon': {
$jdk_package = 'java-1.7.0-openjdk-devel'
$jre_package = 'java-1.7.0-openjdk'
}
} }
} }
'Debian': { 'Debian': {

11
spec/classes/java_spec.rb
View File

@@ -28,4 +28,15 @@ describe 'java', :type => :class do
it { should contain_package('java').with_name('java-1.6.0-openjdk-devel') } it { should contain_package('java').with_name('java-1.6.0-openjdk-devel') }
end end
context 'select openjdk for Amazon Linux' do
let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Amazon', :operatingsystemrelease => '3.4.43-43.43.amzn1.x86_64'} }
it { should contain_package('java').with_name('java-1.7.0-openjdk-devel') }
end
context 'select passed value for Amazon Linux' do
let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Amazon', :operatingsystemrelease => '5.3.4.43-43.43.amzn1.x86_64'} }
let(:params) { { 'distribution' => 'jre' } }
it { should contain_package('java').with_name('java-1.7.0-openjdk') }
end
end end