summaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-11-04 21:29:43 +0000
committerGerrit Code Review <review@openstack.org>2015-11-04 21:29:43 +0000
commit70e76436e9e2970a352982fac8a78567fffa6cad (patch)
tree774856ca635e5b830a90d505a6888d8bb4a6daa8 /puppet
parent62f2237cebe941f1d5ca1b3c86df74ff1df4319a (diff)
parent7093465bcd718b62789fe9fd37948ef217e7a55e (diff)
Merge "Do not enforce start timeout to 90s for neutron-server"
Diffstat (limited to 'puppet')
-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 462530e9..e2989184 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]
}