From 5044f71539c9fcb4a9397a4d19dfbbf41256ea0a Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Thu, 13 Mar 2014 14:33:01 +0100 Subject: [PATCH] Make stonith-enabled/no-quorum-policy variables in crm-initial.conf The values will change depending on options in the wrapper, or other factors. --- attributes/default.rb | 2 ++ recipes/setup.rb | 4 ++++ templates/default/crm-initial.conf.erb | 4 ++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/attributes/default.rb b/attributes/default.rb index 5459595..3d1c376 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -32,3 +32,5 @@ end default[:pacemaker][:founder] = false default[:pacemaker][:crm][:initial_config_file] = "/etc/corosync/crm-initial.conf" +default[:pacemaker][:crm][:stonith_enabled] = false +default[:pacemaker][:crm][:no_quorum_policy] = "ignore" diff --git a/recipes/setup.rb b/recipes/setup.rb index 5f644a1..df4f924 100644 --- a/recipes/setup.rb +++ b/recipes/setup.rb @@ -25,6 +25,10 @@ template crm_conf do owner "root" group "root" mode 0600 + variables( + :stonith_enabled => node[:pacemaker][:crm][:stonith_enabled], + :no_quorum_policy => node[:pacemaker][:crm][:no_quorum_policy] + ) end execute "crm initial configuration" do diff --git a/templates/default/crm-initial.conf.erb b/templates/default/crm-initial.conf.erb index 83232cd..bc4cbf4 100644 --- a/templates/default/crm-initial.conf.erb +++ b/templates/default/crm-initial.conf.erb @@ -1,6 +1,6 @@ property $id="cib-bootstrap-options" \ - stonith-enabled="false" \ - no-quorum-policy="ignore" \ + stonith-enabled="<%= @stonith_enabled %>" \ + no-quorum-policy="<%= @no_quorum_policy %>" \ placement-strategy="balanced" op_defaults $id="op-options" \ timeout="600" \