From 7093465bcd718b62789fe9fd37948ef217e7a55e Mon Sep 17 00:00:00 2001 From: Giulio Fidente Date: Wed, 4 Nov 2015 12:08:23 +0100 Subject: 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 --- puppet/manifests/overcloud_controller_pacemaker.pp | 1 - 1 file changed, 1 deletion(-) 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] } -- cgit 1.2.3-korg