x/fuel-plugin-lma-collector
Code Issues Proposed changes

Fix the Pacemaker resources on MOS 9

Browse Source 
This change removes the migration-threshold and failure-timeout
parameters for the collector resources. Otherwise Pacemaker will forbid
the resource from the node if it fails too many times. And the
declaration of the resources in Pacemaker needs to happen after the
services have been installed too.

Change-Id: Ia8d96ccce4a25e4a1919419cba9b415bd06c65d1
Closes-Bug: #1593137
This commit is contained in:
Simon Pasquier
2016-06-16 11:06:44 +02:00
parent 27174d2196
commit 1e578546a9
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
deployment_scripts/puppet/manifests/base.pp
View File

@@ -107,9 +107,7 @@ if $is_controller or $is_rabbitmq or $is_mysql_server {
ms_metadata => {
# the resource should start as soon as the dependent resources (eg RabbitMQ)
# are running *locally*
'interleave' => true,
'migration-threshold' => '3',
'failure-timeout' => '120',
'interleave' => true,
},
parameters => {
'service_name' => 'log_collector',
@@ -166,9 +164,7 @@ if $is_controller or $is_rabbitmq or $is_mysql_server {
use_handler => false,
ms_metadata => {
# The resource can start at any time
'interleave' => false,
'migration-threshold' => '3',
'failure-timeout' => '120',
'interleave' => false,
},
parameters => {
'service_name' => 'metric_collector',
@@ -201,9 +197,7 @@ if $is_controller or $is_rabbitmq or $is_mysql_server {
complex_metadata => {
# the resource should start as soon as the dependent resources
# (eg RabbitMQ) are running *locally*
'interleave' => true,
'migration-threshold' => '3',
'failure-timeout' => '120',
'interleave' => true,
},
parameters => {
'service_name' => 'log_collector',
@@ -224,6 +218,7 @@ if $is_controller or $is_rabbitmq or $is_mysql_server {
},
},
ocf_script_file => 'lma_collector/ocf-lma_collector',
require => Lma_collector::Heka['log_collector'],
}
if $is_rabbitmq {
@@ -246,9 +241,7 @@ if $is_controller or $is_rabbitmq or $is_mysql_server {
complex_type => 'clone',
complex_metadata => {
# The resource can start at any time
'interleave' => false,
'migration-threshold' => '3',
'failure-timeout' => '120',
'interleave' => false,
},
parameters => {
'service_name' => 'metric_collector',
@@ -269,6 +262,7 @@ if $is_controller or $is_rabbitmq or $is_mysql_server {
},
},
ocf_script_file => 'lma_collector/ocf-lma_collector',
require => Lma_collector::Heka['metric_collector'],
}
}
}