Parameterize JRE package
Add a params class so that puppet can distinguish between JRE packages on different Ubuntu releases. Change-Id: Ia1d22379d915d347c549c8cb8785920d97470f06
This commit is contained in:
parent
f3e089077f
commit
399a2ca633
@ -17,6 +17,7 @@
|
||||
# Class to install common logstash items.
|
||||
#
|
||||
class logstash {
|
||||
include ::logstash::params
|
||||
include ::logrotate
|
||||
|
||||
archive { '/tmp/logstash-2.4.1_all.deb':
|
||||
@ -26,8 +27,8 @@ class logstash {
|
||||
checksum_type => 'sha1',
|
||||
}
|
||||
|
||||
if ! defined(Package['openjdk-7-jre-headless']) {
|
||||
package { 'openjdk-7-jre-headless':
|
||||
if ! defined(Package[$::logstash::params::jre_package]) {
|
||||
package { $::logstash::params::jre_package:
|
||||
ensure => present,
|
||||
}
|
||||
}
|
||||
@ -38,7 +39,7 @@ class logstash {
|
||||
provider => 'dpkg',
|
||||
require => [
|
||||
Package['logrotate'],
|
||||
Package['openjdk-7-jre-headless'],
|
||||
Package[$::logstash::params::jre_package],
|
||||
Archive['/tmp/logstash-2.4.1_all.deb'],
|
||||
]
|
||||
}
|
||||
|
12
manifests/params.pp
Normal file
12
manifests/params.pp
Normal file
@ -0,0 +1,12 @@
|
||||
# logstash::params
|
||||
class logstash::params(
|
||||
) {
|
||||
case $::lsbdistcodename {
|
||||
'xenial': {
|
||||
$jre_package = 'openjdk-8-jre-headless'
|
||||
}
|
||||
default: {
|
||||
$jre_package = 'openjdk-7-jre-headless'
|
||||
}
|
||||
}
|
||||
}
|
@ -52,7 +52,7 @@ describe 'puppet-logstash module', :if => ['debian', 'ubuntu'].include?(os[:fami
|
||||
end
|
||||
|
||||
describe 'required package' do
|
||||
describe package('openjdk-7-jre-headless') do
|
||||
describe package('openjdk-8-jre-headless') do
|
||||
it { should be_installed }
|
||||
end
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user