Install explicit package version of Heka
Change-Id: Ica6a6936cfd8f959758988f97af29d6489734484 Fixes-bug: #1590013
This commit is contained in:
parent
fb3a8d5a0a
commit
c679b05be7
|
@ -14,6 +14,8 @@
|
||||||
|
|
||||||
notice('fuel-plugin-lma-collector: base.pp')
|
notice('fuel-plugin-lma-collector: base.pp')
|
||||||
|
|
||||||
|
$heka_version = '0.10.0'
|
||||||
|
|
||||||
# TODO(spasquier): fail if Neutron isn't used
|
# TODO(spasquier): fail if Neutron isn't used
|
||||||
prepare_network_config(hiera_hash('network_scheme', {}))
|
prepare_network_config(hiera_hash('network_scheme', {}))
|
||||||
$fuel_version = 0 + hiera('fuel_version')
|
$fuel_version = 0 + hiera('fuel_version')
|
||||||
|
@ -85,6 +87,7 @@ lma_collector::heka { 'log_collector':
|
||||||
user => $heka_user,
|
user => $heka_user,
|
||||||
groups => $additional_groups,
|
groups => $additional_groups,
|
||||||
install_init_script => $install_heka_init_script,
|
install_init_script => $install_heka_init_script,
|
||||||
|
version => $heka_version,
|
||||||
require => Class['lma_collector'],
|
require => Class['lma_collector'],
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -92,6 +95,7 @@ lma_collector::heka { 'metric_collector':
|
||||||
user => $heka_user,
|
user => $heka_user,
|
||||||
groups => $additional_groups,
|
groups => $additional_groups,
|
||||||
install_init_script => $install_heka_init_script,
|
install_init_script => $install_heka_init_script,
|
||||||
|
version => $heka_version,
|
||||||
require => Class['lma_collector'],
|
require => Class['lma_collector'],
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -54,6 +54,9 @@
|
||||||
# used when the service is managed by Pacemaker for example.
|
# used when the service is managed by Pacemaker for example.
|
||||||
# (default: true).
|
# (default: true).
|
||||||
#
|
#
|
||||||
|
# [*version*]
|
||||||
|
# The package version to install. (default: 'latest').
|
||||||
|
#
|
||||||
# === Examples
|
# === Examples
|
||||||
#
|
#
|
||||||
# class { 'heka':
|
# class { 'heka':
|
||||||
|
@ -81,6 +84,7 @@ define heka (
|
||||||
$pre_script = undef,
|
$pre_script = undef,
|
||||||
$internal_statistics = undef,
|
$internal_statistics = undef,
|
||||||
$install_init_script = true,
|
$install_init_script = true,
|
||||||
|
$version = 'latest',
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include heka::params
|
include heka::params
|
||||||
|
@ -146,7 +150,7 @@ define heka (
|
||||||
|
|
||||||
if ! defined(Package[$heka::params::package_name]) {
|
if ! defined(Package[$heka::params::package_name]) {
|
||||||
package { $heka::params::package_name:
|
package { $heka::params::package_name:
|
||||||
ensure => latest,
|
ensure => $version,
|
||||||
alias => 'heka',
|
alias => 'heka',
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -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']`.
|
* `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).
|
* `poolsize`: *Optional*. The pool size of maximum messages that can exist (default: 100).
|
||||||
* `heka_monitoring`: *Optional*. Enable the hekad plugins monitoring by configuring
|
* `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).
|
* `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.
|
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`
|
#### Define: `lma_collector::logs::openstack`
|
||||||
|
|
||||||
|
|
|
@ -35,6 +35,7 @@ define lma_collector::heka (
|
||||||
$heka_monitoring = true,
|
$heka_monitoring = true,
|
||||||
$poolsize = 100,
|
$poolsize = 100,
|
||||||
$install_init_script = true,
|
$install_init_script = true,
|
||||||
|
$version = 'latest',
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include lma_collector::params
|
include lma_collector::params
|
||||||
|
@ -98,6 +99,7 @@ define lma_collector::heka (
|
||||||
max_timer_inject => $lma_collector::params::hekad_max_timer_inject,
|
max_timer_inject => $lma_collector::params::hekad_max_timer_inject,
|
||||||
poolsize => $poolsize,
|
poolsize => $poolsize,
|
||||||
install_init_script => $install_init_script,
|
install_init_script => $install_init_script,
|
||||||
|
version => $version,
|
||||||
}
|
}
|
||||||
|
|
||||||
# Heka self-monitoring
|
# Heka self-monitoring
|
||||||
|
|
Loading…
Reference in New Issue