diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-10-14 13:40:23 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-10-14 13:40:23 +0000 |
| commit | 33be802c705c857ce94a80252bc22b2e01e27fa8 (patch) | |
| tree | 1b47f9e9853e1a1e1bfde1b3cb51085da301510a | |
| parent | dae21b71bb7c9e5a5661afc4e0653220c3ae10cf (diff) | |
| parent | 12910de9230ab5e04b0f8a78cc6245186f4cea34 (diff) | |
Merge "pacemaker: increase timeouts for rabbitmq and redis"
| -rw-r--r-- | manifests/profile/pacemaker/database/redis.pp | 1 | ||||
| -rw-r--r-- | manifests/profile/pacemaker/rabbitmq.pp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/manifests/profile/pacemaker/database/redis.pp b/manifests/profile/pacemaker/database/redis.pp index e081516..261df30 100644 --- a/manifests/profile/pacemaker/database/redis.pp +++ b/manifests/profile/pacemaker/database/redis.pp @@ -60,6 +60,7 @@ class tripleo::profile::pacemaker::database::redis ( master_params => '', meta_params => 'notify=true ordered=true interleave=true', resource_params => 'wait_last_known_master=true', + op_params => 'start timeout=200s stop timeout=200s', require => Class['::redis'], } } diff --git a/manifests/profile/pacemaker/rabbitmq.pp b/manifests/profile/pacemaker/rabbitmq.pp index 8d5f9d0..dba01e3 100644 --- a/manifests/profile/pacemaker/rabbitmq.pp +++ b/manifests/profile/pacemaker/rabbitmq.pp @@ -86,6 +86,7 @@ class tripleo::profile::pacemaker::rabbitmq ( resource_params => "set_policy='ha-all ^(?!amq\\.).* {\"ha-mode\":\"exactly\",\"ha-params\":${nr_ha_queues}}'", clone_params => 'ordered=true interleave=true', meta_params => 'notify=true', + op_params => 'start timeout=200s stop timeout=200s', require => Class['::rabbitmq'], } } |