summaryrefslogtreecommitdiffstats
path: root/manifests/profile/pacemaker/neutron.pp
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-10-04 09:12:27 +0000
committerGerrit Code Review <review@openstack.org>2016-10-04 09:12:27 +0000
commit264d49a255024eba9ea3bf2086c63e9d49b6da11 (patch)
tree311c161c9ffee8de04717affcd683a345cf56d72 /manifests/profile/pacemaker/neutron.pp
parentd86516383390f73134b427fe2e4627161840409f (diff)
parent0bc59a7362ea5c9a01fe8bf521e19a4014577079 (diff)
Merge "Fix the timeout for pacemaker systemd resources"
Diffstat (limited to 'manifests/profile/pacemaker/neutron.pp')
-rw-r--r--manifests/profile/pacemaker/neutron.pp2
1 files changed, 2 insertions, 0 deletions
diff --git a/manifests/profile/pacemaker/neutron.pp b/manifests/profile/pacemaker/neutron.pp
index 6525126..ccc1401 100644
--- a/manifests/profile/pacemaker/neutron.pp
+++ b/manifests/profile/pacemaker/neutron.pp
@@ -91,11 +91,13 @@ class tripleo::profile::pacemaker::neutron (
unless => '/sbin/pcs resource show neutron-server',
} ->
pacemaker::resource::service { $::neutron::params::server_service:
+ op_params => 'start timeout=200s stop timeout=200s',
clone_params => 'interleave=true',
require => Pacemaker::Resource::Ocf['openstack-core']
}
} else {
pacemaker::resource::service { $::neutron::params::server_service:
+ op_params => 'start timeout=200s stop timeout=200s',
clone_params => 'interleave=true',
require => Pacemaker::Resource::Ocf['openstack-core']
}