Allow multiple rings in nodelist

Closes #262
voxpupuli · Aug 31, 2016 · 2eef8be · 2eef8be · rhamon · Aug 31, 2016
1 parent 6939858
commit 2eef8be
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -142,6 +142,8 @@
 # [*quorum_members*]
 #   Array of quorum member hostname. This is required if set_votequorum
 #   is set to true.
+#   You can also have an array of arrays to have multiple rings. In that case,
+#   each subarray matches a member IP addresses.
 #   Defaults to ['localhost']
 #
 # [*quorum_members_ids*]

diff --git a/templates/corosync.conf.erb b/templates/corosync.conf.erb
@@ -88,9 +88,11 @@ quorum {
 
 <% unless @votequorum_expected_votes -%>
 nodelist {
-<% [@quorum_members].flatten.each_index do |i| -%>
+<% Array(@quorum_members).each_index do |i| -%>
   node {
-    ring0_addr: <%= [@quorum_members].flatten[i] %>
+<% Array(Array(@quorum_members.map{|node| Array(node).flatten})[i]).each_with_index do |addr,ring| -%>
+    ring<%= ring %>_addr: <%= addr %>
+<% end -%>
 <% if @quorum_members_ids.nil? -%>
     nodeid: <%= i+1 %>
 <% else -%>

diff --git a/templates/corosync.conf.udpu.erb b/templates/corosync.conf.udpu.erb
@@ -20,11 +20,11 @@ totem {
   secauth:                             <%= @enable_secauth_real %>
   threads:                             <%= @threads %>
   transport:                           udpu
-<% (0..Array(@unicast_addresses.first).length-1).each do |interface| -%>
+<% Array(@unicast_addresses.first).each_index do |interface| -%>
   interface {
-<% @unicast_addresses.each do |addr| -%>
+<% Array(Array(@unicast_addresses.map{|x| Array(x).flatten}).transpose[interface]).each do |addr| -%>
     member {
-      memberaddr: <%= Array(addr)[interface] %>
+      memberaddr: <%= addr %>
     }
 <% end -%>
     ringnumber:  <%= interface %>
@@ -88,9 +88,11 @@ quorum {
 
 <% unless @votequorum_expected_votes -%>
 nodelist {
-<% [@quorum_members].flatten.each_index do |i| -%>
+<% Array(@quorum_members).each_index do |i| -%>
   node {
-    ring0_addr: <%= [@quorum_members].flatten[i] %>
+<% Array(Array(@quorum_members.map{|node| Array(node).flatten})[i]).each_with_index do |addr,ring| -%>
+    ring<%= ring %>_addr: <%= addr %>
+<% end -%>
 <% if @quorum_members_ids.nil? -%>
     nodeid: <%= i+1 %>
 <% else -%>