Proper handling for array of arrays

voxpupuli · Jun 23, 2016 · 64628a2 · 64628a2
1 parent 2523a41
commit 64628a2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/templates/corosync.conf.erb b/templates/corosync.conf.erb
@@ -85,15 +85,15 @@ quorum {
   two_node: 1
 <% end -%>
 <% else -%>
-<% if [@quorum_members].flatten.count == 2 -%>
+<% if Array(@quorum_members).length == 2 -%>
   two_node: 1
 <% end -%>
 <% end -%>
 }
 
 <% unless @votequorum_expected_votes -%>
 nodelist {
-<% [@quorum_members].flatten.each_index do |i| -%>
+<% Array(@quorum_members).each_index do |i| -%>
   node {
 <% Array(Array(@quorum_members.map{|node| Array(node).flatten})[i]).each_with_index do |addr,ring| -%>
     ring<%= ring %>_addr: <%= addr %>

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 %>
@@ -86,15 +86,15 @@ quorum {
   two_node: 1
 <% end -%>
 <% else -%>
-<% if [@quorum_members].flatten.count == 2 -%>
+<% if Array(@quorum_members).length == 2 -%>
   two_node: 1
 <% end -%>
 <% end -%>
 }
 
 <% unless @votequorum_expected_votes -%>
 nodelist {
-<% [@quorum_members].flatten.each_index do |i| -%>
+<% Array(@quorum_members).each_index do |i| -%>
   node {
 <% Array(Array(@quorum_members.map{|node| Array(node).flatten})[i]).each_with_index do |addr,ring| -%>
     ring<%= ring %>_addr: <%= addr %>