Add flag to enable two node quorum behaviour.

tdb · Mar 14, 2015 · f3b3be1 · f3b3be1
1 parent 299dff9
commit f3b3be1
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 0 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -77,6 +77,9 @@
 #   Array of quorum member hostname. 
 #   Defaults to undef.
 #
+# [*two_node*]
+#   Set to 1 to enable special quorum behaviour when only using two nodes.
+#
 # [*token*]
 #   Time (in ms) to wait for a token
 #
@@ -117,6 +120,7 @@
   $set_votequorum                      = $::corosync::params::set_votequorum,
   $expected_votes                      = $::corosync::params::expected_votes,
   $quorum_members                      = $::corosync::params::quorum_members,
+  $two_node                            = $::corosync::params::two_node,
   $token                               = $::corosync::params::token,
   $token_retransmits_before_loss_const = $::corosync::params::token_retransmits_before_lost_const,
 ) inherits ::corosync::params {

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -15,6 +15,7 @@
   $packages                            = ['corosync', 'pacemaker']
   $expected_votes                      = undef
   $quorum_members                      = undef
+  $two_node                            = undef
   $token                               = 3000
   $token_retransmits_before_lost_const = 10
 

diff --git a/templates/corosync.conf.erb b/templates/corosync.conf.erb
@@ -59,6 +59,9 @@ quorum {
 <% if @expected_votes -%>
   expected_votes: <%= @expected_votes %>
 <% end -%>
+<% if @two_node -%>
+  two_node: <%= @two_node %>
+<% end -%>
 }
 <% end -%>
 

diff --git a/templates/corosync.conf.udpu.erb b/templates/corosync.conf.udpu.erb
@@ -55,7 +55,12 @@ aisexec {
 <% if @set_votequorum -%>
 quorum {
   provider: corosync_votequorum
+<% if @expected_votes -%>
   expected_votes: <%= @expected_votes %>
+<% end -%>
+<% if @two_node -%>
+  two_node: <%= @two_node %>
+<% end -%>
 }
 <% end -%>