From 34098f23e63ad31819d12204bc26636b07d6a243 Mon Sep 17 00:00:00 2001 From: Walter Huf Date: Fri, 21 Mar 2014 15:05:15 -0500 Subject: [PATCH] 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 --- libraries/default.rb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libraries/default.rb b/libraries/default.rb index 47d0101..4f6fc03 100644 --- 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) -- 2.47.3