diff options
| author |   Michele Baldessari <michele@acksyn.org> | 2016-10-01 00:10:18 +0200 |
|---|---|---|
| committer |   Emilien Macchi <emilien@redhat.com> | 2016-10-03 18:27:36 +0000 |
| commit | 0bc59a7362ea5c9a01fe8bf521e19a4014577079 (patch) | |
| tree | a4676cbe8167b8244b23ab5b97b0dd2a5f10f75d /manifests/profile/pacemaker/gnocchi | |
| parent | c08431d41aa5a447ebef669a152143e1274a227d (diff) | |
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
Diffstat (limited to 'manifests/profile/pacemaker/gnocchi')
| -rw-r--r-- | manifests/profile/pacemaker/gnocchi/metricd.pp | 1 | ||||
| -rw-r--r-- | manifests/profile/pacemaker/gnocchi/statsd.pp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/manifests/profile/pacemaker/gnocchi/metricd.pp b/manifests/profile/pacemaker/gnocchi/metricd.pp index c9dc2d9..aacec01 100644 --- a/manifests/profile/pacemaker/gnocchi/metricd.pp +++ b/manifests/profile/pacemaker/gnocchi/metricd.pp @@ -39,6 +39,7 @@ class tripleo::profile::pacemaker::gnocchi::metricd ( include ::gnocchi::metricd pacemaker::resource::service { $::gnocchi::params::metricd_service_name : + op_params => 'start timeout=200s stop timeout=200s', clone_params => 'interleave=true', } } diff --git a/manifests/profile/pacemaker/gnocchi/statsd.pp b/manifests/profile/pacemaker/gnocchi/statsd.pp index 42d30b9..1058010 100644 --- a/manifests/profile/pacemaker/gnocchi/statsd.pp +++ b/manifests/profile/pacemaker/gnocchi/statsd.pp @@ -39,6 +39,7 @@ class tripleo::profile::pacemaker::gnocchi::statsd ( include ::gnocchi::statsd pacemaker::resource::service { $::gnocchi::params::statsd_service_name : + op_params => 'start timeout=200s stop timeout=200s', clone_params => 'interleave=true', } } |