Install explicit package version of Heka

Change-Id: Ica6a6936cfd8f959758988f97af29d6489734484
Fixes-bug: #1590013
This commit is contained in:
Swann Croiset 2016-06-07 16:11:21 +02:00 committed by Simon Pasquier
parent fb3a8d5a0a
commit c679b05be7
4 changed files with 14 additions and 3 deletions

View File

@ -14,6 +14,8 @@
notice('fuel-plugin-lma-collector: base.pp')
$heka_version = '0.10.0'
# TODO(spasquier): fail if Neutron isn't used
prepare_network_config(hiera_hash('network_scheme', {}))
$fuel_version = 0 + hiera('fuel_version')
@ -85,6 +87,7 @@ lma_collector::heka { 'log_collector':
user => $heka_user,
groups => $additional_groups,
install_init_script => $install_heka_init_script,
version => $heka_version,
require => Class['lma_collector'],
}
@ -92,6 +95,7 @@ lma_collector::heka { 'metric_collector':
user => $heka_user,
groups => $additional_groups,
install_init_script => $install_heka_init_script,
version => $heka_version,
require => Class['lma_collector'],
}

View File

@ -54,6 +54,9 @@
# used when the service is managed by Pacemaker for example.
# (default: true).
#
# [*version*]
# The package version to install. (default: 'latest').
#
# === Examples
#
# class { 'heka':
@ -81,6 +84,7 @@ define heka (
$pre_script = undef,
$internal_statistics = undef,
$install_init_script = true,
$version = 'latest',
) {
include heka::params
@ -146,7 +150,7 @@ define heka (
if ! defined(Package[$heka::params::package_name]) {
package { $heka::params::package_name:
ensure => latest,
ensure => $version,
alias => 'heka',
}

View File

@ -937,10 +937,11 @@ The title must be either `log_collector` or `metric_collector`.
* `groups`: *Optional*. Additional groups to add to the user running the Heka service. Ignored if the Heka service is run as "root". Valid options: an array of strings. Default: `['syslog', 'adm']`.
* `poolsize`: *Optional*. The pool size of maximum messages that can exist (default: 100).
* `heka_monitoring`: *Optional*. Enable the hekad plugins monitoring by configuring
the Heka dashboard and a filter plugin. (default: true, valid option: boolean).
the Heka dashboard and a filter plugin. Valid options: boolean. Default: true.
* `install_init_script`: *Optional*. Whether or not install the init script (Upstart or Systemd).
This is typically used when the service is managed by Pacemaker for example.
(default: true, valid option: boolean).
Valid options: boolean. Default: true.
* `version`: *Optional*. The Heka version to install. Default: 'latest'.
#### Define: `lma_collector::logs::openstack`

View File

@ -35,6 +35,7 @@ define lma_collector::heka (
$heka_monitoring = true,
$poolsize = 100,
$install_init_script = true,
$version = 'latest',
) {
include lma_collector::params
@ -98,6 +99,7 @@ define lma_collector::heka (
max_timer_inject => $lma_collector::params::hekad_max_timer_inject,
poolsize => $poolsize,
install_init_script => $install_init_script,
version => $version,
}
# Heka self-monitoring