Merge pull request #29 from actionjack/master

Added support for Amazon linux
This commit is contained in:
Brett Porter
2013-07-12 20:11:22 -07:00
3 changed files with 18 additions and 0 deletions

3
.gitignore vendored
View File

@@ -2,3 +2,6 @@ pkg/
.DS_Store
metadata.json
spec/fixtures
*.idea
*.swp
*.tmp

View File

@@ -35,6 +35,10 @@ class java::params {
$jdk_package = 'java'
$jre_package = 'java'
}
'Amazon': {
$jdk_package = 'java-1.7.0-openjdk-devel'
$jre_package = 'java-1.7.0-openjdk'
}
}
$java = {
'jdk' => { 'package' => $jdk_package, },

View File

@@ -63,4 +63,15 @@ describe 'java', :type => :class do
it { should contain_exec('update-java-alternatives').with_command('update-java-alternatives --set bananafish --jre') }
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