lib/ring/sqa/nodes.rb in ring-sqa-0.0.23 vs lib/ring/sqa/nodes.rb in ring-sqa-0.1.0
- old
+ new
@@ -37,16 +37,17 @@
list << entry.first
end
nodes_hash list
rescue => error
Log.warn "#{error.class} raised with message '#{error.message}' while generating nodes list"
- @all
+ (@all or {})
end
def nodes_hash ips, file=CFG.nodes_json
nodes = {}
json = JSON.load File.read(file)
json['results']['nodes'].each do |node|
+ next if node['service']['sqa'] == false rescue nil
addr = node[CFG.afi]
next unless ips.include? addr
nodes[addr] = node
end
json_to_nodes_hash nodes