From: Giulio Fidente <gfidente@redhat.com>
Date: Wed, 15 Jul 2015 12:35:46 +0000 (+0200)
Subject: Increase default start timeout for Pacemaker from 20s to 90s
X-Git-Tag: opnfv-6.0.0~2427
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=9e6d86c02b2646c2cdbdce44dff726de24fb18ac;p=apex-tripleo-heat-templates.git

Increase default start timeout for Pacemaker from 20s to 90s

On slow environments the start operation of some services can
take longer than 20s so we increase the default for start
operation to 90s, more info can be found at:
https://bugzilla.redhat.com/show_bug.cgi?id=1242052

Systemd defaults to 90s as well.

Change-Id: Ie4652bad518075be77937d47830f263034eda79c
---

diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index 24a2f734..480ac550 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -74,6 +74,13 @@ if hiera('step') >= 1 {
     Class['tripleo::fencing'] -> Class['pacemaker::stonith']
   }
 
+  # FIXME(gfidente): sets 90secs as default start timeout op
+  # param; until we can use pcmk global defaults we'll still
+  # need to add it to every resource which redefines op params
+  Pacemaker::Resource::Service {
+    op_params => 'start timeout=90s',
+  }
+
   # Only configure RabbitMQ in this step, don't start it yet to
   # avoid races where non-master nodes attempt to start without
   # config (eg. binding on 0.0.0.0)
@@ -1087,24 +1094,24 @@ if hiera('step') >= 4 {
     # Nova
     pacemaker::resource::service { $::nova::params::api_service_name :
       clone_params    => "interleave=true",
-      op_params       => "monitor start-delay=10s",
+      op_params       => "start timeout=90s monitor start-delay=10s",
     }
     pacemaker::resource::service { $::nova::params::conductor_service_name :
       clone_params    => "interleave=true",
-      op_params       => "monitor start-delay=10s",
+      op_params       => "start timeout=90s monitor start-delay=10s",
     }
     pacemaker::resource::service { $::nova::params::consoleauth_service_name :
       clone_params    => "interleave=true",
-      op_params       => "monitor start-delay=10s",
+      op_params       => "start timeout=90s monitor start-delay=10s",
       require         => Pacemaker::Resource::Service[$::keystone::params::service_name],
     }
     pacemaker::resource::service { $::nova::params::vncproxy_service_name :
       clone_params    => "interleave=true",
-      op_params       => "monitor start-delay=10s",
+      op_params       => "start timeout=90s monitor start-delay=10s",
     }
     pacemaker::resource::service { $::nova::params::scheduler_service_name :
       clone_params    => "interleave=true",
-      op_params       => "monitor start-delay=10s",
+      op_params       => "start timeout=90s monitor start-delay=10s",
     }
 
     pacemaker::constraint::base { 'keystone-then-nova-consoleauth-constraint':