stackforge/cookbook-pacemaker
Code Issues Proposed changes

pacemaker: Change default op timeout from 10 minutes to 1 minute

Browse Source 
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.
This commit is contained in:
Vincent Untz
2014-04-17 16:19:10 +02:00
parent c8567bc5cd
commit 46584ae2da
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
attributes/default.rb
View File

@@ -33,6 +33,7 @@ end
default[:pacemaker][:founder] = false default[:pacemaker][:founder] = false
default[:pacemaker][:crm][:initial_config_file] = "/etc/corosync/crm-initial.conf" default[:pacemaker][:crm][:initial_config_file] = "/etc/corosync/crm-initial.conf"
default[:pacemaker][:crm][:no_quorum_policy] = "ignore" default[:pacemaker][:crm][:no_quorum_policy] = "ignore"
default[:pacemaker][:crm][:op_default_timeout] = 60
# Values can be "disabled", "manual", "sbd", "shared", "per_node" # Values can be "disabled", "manual", "sbd", "shared", "per_node"
default[:pacemaker][:stonith][:mode] = "disabled" default[:pacemaker][:stonith][:mode] = "disabled"

3
recipes/setup.rb
View File

@@ -27,7 +27,8 @@ template crm_conf do
mode 0600 mode 0600
variables( variables(
:stonith_enabled => (node[:pacemaker][:stonith][:mode] != "disabled"), :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 end

2
templates/default/crm-initial.conf.erb
View File

@@ -3,7 +3,7 @@ property $id="cib-bootstrap-options" \
no-quorum-policy="<%= @no_quorum_policy %>" \ no-quorum-policy="<%= @no_quorum_policy %>" \
placement-strategy="balanced" placement-strategy="balanced"
op_defaults $id="op-options" \ op_defaults $id="op-options" \
timeout="600" \ timeout="<%= @op_default_timeout %>" \
record-pending="true" record-pending="true"
rsc_defaults $id="rsc-options" \ rsc_defaults $id="rsc-options" \
resource-stickiness="1" \ resource-stickiness="1" \