Merge pull request #29 from actionjack/master
Added support for Amazon linux
This commit is contained in:
3
.gitignore
vendored
3
.gitignore
vendored
@@ -2,3 +2,6 @@ pkg/
|
|||||||
.DS_Store
|
.DS_Store
|
||||||
metadata.json
|
metadata.json
|
||||||
spec/fixtures
|
spec/fixtures
|
||||||
|
*.idea
|
||||||
|
*.swp
|
||||||
|
*.tmp
|
||||||
@@ -35,6 +35,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'
|
||||||
|
}
|
||||||
}
|
}
|
||||||
$java = {
|
$java = {
|
||||||
'jdk' => { 'package' => $jdk_package, },
|
'jdk' => { 'package' => $jdk_package, },
|
||||||
|
|||||||
@@ -63,4 +63,15 @@ describe 'java', :type => :class do
|
|||||||
it { should contain_exec('update-java-alternatives').with_command('update-java-alternatives --set bananafish --jre') }
|
it { should contain_exec('update-java-alternatives').with_command('update-java-alternatives --set bananafish --jre') }
|
||||||
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
|
||||||
|
|||||||
Reference in New Issue
Block a user