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

Merge pull request #30 from wavesoftware/master

Browse Source 
Adding support for Oracle Enterprise Linux with spec tests
This commit is contained in:
Brett Porter
2013-07-28 19:41:54 -07:00
parent aa89d8b510 2d70d838ba
commit 454a1c73f7
2 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/params.pp
View File

@@ -17,7 +17,7 @@ class java::params {
'RedHat': { 'RedHat': {
case $::operatingsystem { case $::operatingsystem {
default: { fail("unsupported os ${::operatingsystem}") } default: { fail("unsupported os ${::operatingsystem}") }
'RedHat', 'CentOS': { 'RedHat', 'CentOS', 'OracleLinux': {
if (versioncmp($::operatingsystemrelease, '5.0') < 0) { if (versioncmp($::operatingsystemrelease, '5.0') < 0) {
$jdk_package = 'java-1.6.0-sun-devel' $jdk_package = 'java-1.6.0-sun-devel'
$jre_package = 'java-1.6.0-sun' $jre_package = 'java-1.6.0-sun'

16
spec/classes/java_spec.rb
View File

@@ -74,6 +74,22 @@ describe 'java', :type => :class do
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 openjdk for Oracle Linux' do
let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'OracleLinux', :operatingsystemrelease => '6.4'} }
it { should contain_package('java').with_name('java-1.7.0-openjdk-devel') }
end
context 'select openjdk for Oracle Linux 6.2' do
let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'OracleLinux', :operatingsystemrelease => '6.2'} }
it { should contain_package('java').with_name('java-1.6.0-openjdk-devel') }
end
context 'select passed value for Oracle Linux' do
let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'OracleLinux', :operatingsystemrelease => '6.3'} }
let(:params) { { 'distribution' => 'jre' } }
it { should contain_package('java').with_name('java-1.7.0-openjdk') }
end
context 'select default for OpenSUSE 12.3' do context 'select default for OpenSUSE 12.3' do
let(:facts) { {:osfamily => 'Suse', :operatingsystem => 'OpenSUSE', :operatingsystemrelease => '12.3'}} let(:facts) { {:osfamily => 'Suse', :operatingsystem => 'OpenSUSE', :operatingsystemrelease => '12.3'}}
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')}