From 46584ae2da5ffb2ac1c04f7bd2f233347ef17e22 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Thu, 17 Apr 2014 16:19:10 +0200 Subject: [PATCH] pacemaker: Change default op timeout from 10 minutes to 1 minute 10 minutes is way too long and people have time to think that something is just totally broken. 1 minute is more reasonable. And in the worst case, an attribute can be set to change this now. --- attributes/default.rb | 1 + recipes/setup.rb | 3 ++- templates/default/crm-initial.conf.erb | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/attributes/default.rb b/attributes/default.rb index 2f2fb2d..4e76fc9 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -33,6 +33,7 @@ end default[:pacemaker][:founder] = false default[:pacemaker][:crm][:initial_config_file] = "/etc/corosync/crm-initial.conf" default[:pacemaker][:crm][:no_quorum_policy] = "ignore" +default[:pacemaker][:crm][:op_default_timeout] = 60 # Values can be "disabled", "manual", "sbd", "shared", "per_node" default[:pacemaker][:stonith][:mode] = "disabled" diff --git a/recipes/setup.rb b/recipes/setup.rb index a806014..5cd05f0 100644 --- a/recipes/setup.rb +++ b/recipes/setup.rb @@ -27,7 +27,8 @@ template crm_conf do mode 0600 variables( :stonith_enabled => (node[:pacemaker][:stonith][:mode] != "disabled"), - :no_quorum_policy => node[:pacemaker][:crm][:no_quorum_policy] + :no_quorum_policy => node[:pacemaker][:crm][:no_quorum_policy], + :op_default_timeout => node[:pacemaker][:crm][:op_default_timeout] ) end diff --git a/templates/default/crm-initial.conf.erb b/templates/default/crm-initial.conf.erb index bc4cbf4..9b8ec50 100644 --- a/templates/default/crm-initial.conf.erb +++ b/templates/default/crm-initial.conf.erb @@ -3,7 +3,7 @@ property $id="cib-bootstrap-options" \ no-quorum-policy="<%= @no_quorum_policy %>" \ placement-strategy="balanced" op_defaults $id="op-options" \ - timeout="600" \ + timeout="<%= @op_default_timeout %>" \ record-pending="true" rsc_defaults $id="rsc-options" \ resource-stickiness="1" \