Finds the primary ipv4 on mon nodes

Prevents issues with clustered IPs being used in ceph.conf files
Since ceph-mon doesn't bind to these ips, don't consider them as mon addrs

diff --git a/libraries/default.rb b/libraries/default.rb
index 47d010103fd8e879185e8943f50aa0502987b64c..4f6fc03fccea4e3688993fc55a06fb3627f6492e 100644 (file)
--- a/libraries/default.rb
+++ b/libraries/default.rb
@@ -41,7 +41,13 @@ def find_node_ip_in_network(network, nodeish = nil)
 end
 
 def ip_address_in_network?(ip, params, net)
-  ['inet', 'inet6'].include?(params['family']) && net.include?(ip)
+  if params['family'] == 'inet'
+    net.include?(ip) && params.key?('broadcast')     # is primary ip on iface
+  elsif params['family'] == 'inet6'
+    net.include?(ip)
+  else
+    false
+  end
 end
 
 def ip_address_to_ceph_address(ip, params)