diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-10-04 09:12:27 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-10-04 09:12:27 +0000 |
| commit | 264d49a255024eba9ea3bf2086c63e9d49b6da11 (patch) | |
| tree | 311c161c9ffee8de04717affcd683a345cf56d72 /manifests/profile/base | |
| parent | d86516383390f73134b427fe2e4627161840409f (diff) | |
| parent | 0bc59a7362ea5c9a01fe8bf521e19a4014577079 (diff) | |
Merge "Fix the timeout for pacemaker systemd resources"
Diffstat (limited to 'manifests/profile/base')
| -rw-r--r-- | manifests/profile/base/pacemaker.pp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/manifests/profile/base/pacemaker.pp b/manifests/profile/base/pacemaker.pp index 0d628b5..43edfaf 100644 --- a/manifests/profile/base/pacemaker.pp +++ b/manifests/profile/base/pacemaker.pp @@ -69,13 +69,6 @@ class tripleo::profile::base::pacemaker ( Class['tripleo::fencing'] -> Class['pacemaker::stonith'] } - # FIXME(gfidente): sets 200secs as default start timeout op - # param; until we can use pcmk global defaults we'll still - # need to add it to every resource which redefines op params - Pacemaker::Resource::Service { - op_params => 'start timeout=200s stop timeout=200s', - } - file { '/var/lib/tripleo/pacemaker-restarts': ensure => directory, } ~> Tripleo::Pacemaker::Resource_restart_flag<||> |