From 0bc59a7362ea5c9a01fe8bf521e19a4014577079 Mon Sep 17 00:00:00 2001 From: Michele Baldessari Date: Sat, 1 Oct 2016 00:10:18 +0200 Subject: Fix the timeout for pacemaker systemd resources Back in the Mitaka cycle via the change If6b43982c958f63bc78ad997400bf1279c23df7e we made sure that the default start and stop timeouts for pacemaker systemd resources is 200s (>= twice the default 90s DefaultTimeoutStopSec in systemd). We did this change by setting puppet resource defaults for the Pacemaker::Resource::Service class: Pacemaker::Resource::Service { op_params => 'start timeout=200s stop timeout=200s', } The problem is that after the composable services rework, this does not work anymore and the pacemaker systemd resources that still exist do not have these timeouts set. We want to move away from resource defaults for this because its results are dependent on the inclusion order which in tripleo is not guaranteed any longer (https://docs.puppet.com/puppet/latest/reference/lang_scope.html#scope-lookup-rules) The only services affected in Newton are: cinder-volume, cinder-backup, manila-share, haproxy. I preferred fixing all the pacemaker resources because it seems the cleanest and most logical commit. Change-Id: If89a95706514e536a7a2949871a0002c79b6046e Closes-Bug: #1629366 --- manifests/profile/pacemaker/sahara/api.pp | 1 + manifests/profile/pacemaker/sahara/engine.pp | 1 + 2 files changed, 2 insertions(+) (limited to 'manifests/profile/pacemaker/sahara') diff --git a/manifests/profile/pacemaker/sahara/api.pp b/manifests/profile/pacemaker/sahara/api.pp index 0e3d97a..70632d1 100644 --- a/manifests/profile/pacemaker/sahara/api.pp +++ b/manifests/profile/pacemaker/sahara/api.pp @@ -43,6 +43,7 @@ class tripleo::profile::pacemaker::sahara::api ( if $step >= 5 and $pacemaker_master { # Sahara pacemaker::resource::service { $::sahara::params::api_service_name : + op_params => 'start timeout=200s stop timeout=200s', clone_params => 'interleave=true', } } diff --git a/manifests/profile/pacemaker/sahara/engine.pp b/manifests/profile/pacemaker/sahara/engine.pp index ada6c06..640acc0 100644 --- a/manifests/profile/pacemaker/sahara/engine.pp +++ b/manifests/profile/pacemaker/sahara/engine.pp @@ -42,6 +42,7 @@ class tripleo::profile::pacemaker::sahara::engine ( if $step >= 5 and $pacemaker_master { pacemaker::resource::service { $::sahara::params::engine_service_name : + op_params => 'start timeout=200s stop timeout=200s', clone_params => 'interleave=true', } } -- cgit 1.2.3-korg