aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGiulio Fidente <gfidente@redhat.com>2015-11-04 12:08:23 +0100
committerGiulio Fidente <gfidente@redhat.com>2015-11-04 12:08:23 +0100
commit7093465bcd718b62789fe9fd37948ef217e7a55e (patch)
tree754424f5b78d3a165596049031f114e021152234
parentb60e8f79a26564b567f7620727428da50d7815b5 (diff)
Do not enforce start timeout to 90s for neutron-server
The same timeout value is set for every pcmk service in [1] 1. https://github.com/openstack/tripleo-heat-templates/blob/master/puppet/manifests/overcloud_controller_pacemaker.pp#L81 Change-Id: I253f6cbc5ccdbf8c46cc537ff9600f201aae540a
-rw-r--r--puppet/manifests/overcloud_controller_pacemaker.pp1
1 files changed, 0 insertions, 1 deletions
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index 71811563..2d5f65f7 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -1057,7 +1057,6 @@ if hiera('step') >= 4 {
# https://bugzilla.redhat.com/show_bug.cgi?id=1233061
exec { '/usr/bin/systemctl start neutron-server && /usr/bin/sleep 5' : } ->
pacemaker::resource::service { $::neutron::params::server_service:
- op_params => "start timeout=90",
clone_params => "interleave=true",
require => Pacemaker::Resource::Service[$::keystone::params::service_name]
}