Fixes the mon_addresses refactor

diff --git a/libraries/default.rb b/libraries/default.rb
index 8b00ccdecc97e161b7127ff55f458d7610f9b704..69f031551271a697448bc98ba9ca349b9bdb69e7 100644 (file)
--- a/libraries/default.rb
+++ b/libraries/default.rb
@@ -34,16 +34,20 @@ def find_node_ip_in_network(network, nodeish = nil)
   nodeish['network']['interfaces'].each do |iface, addrs|
     addresses = addrs['addresses'] || []
     addresses.each do |ip, params|
-      return ip_address_to_ceph_address(ip, params) if net.include?(ip)
+      return ip_address_to_ceph_address(ip, params) if ip_address_in_network(ip, params, net)
     end
   end
   nil
 end
 
+def ip_address_in_network(ip, params, net)
+  ['inet', 'inet6'].include?(params['family']) && net.include?(ip)
+end
+
 def ip_address_to_ceph_address(ip, params)
-  if params['family'].eql?('inet6') && net.include?(ip)
+  if params['family'].eql?('inet6')
     return "[#{ip}]:6789"
-  elsif params['family'].eql?('inet') && net.include?(ip)
+  elsif params['family'].eql?('inet')
     return "#{ip}:6789"
   end
 end