x/compass-adapters
Code Issues Proposed changes

Fix an error on empty list from chef search

Browse Source 
Change-Id: Iacfd5614849b3885c5be833122d1f640c34ce66c
This commit is contained in:
Weidong Shao 2014-09-02 23:44:25 +00:00
parent 0799cbabff
commit 305f84685d
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
chef/cookbooks/openstack-identity/libraries/default.rb
View File

@ -27,10 +27,15 @@ def node_election(role, tag, chef_environment = nil)
nodes = search(:node, "run_list:role\\[#{role}\\] AND \ nodes = search(:node, "run_list:role\\[#{role}\\] AND \
chef_environment:#{chef_environment}") || [] chef_environment:#{chef_environment}") || []
nodes = nodes.sort_by { |node| node.name } unless nodes.empty? nodes = nodes.sort_by { |node| node.name } unless nodes.empty?
if node.name.eql?(nodes.first.name) if nodes.empty? or node.name.eql?(nodes.first.name)
node.tags << tag unless node.tags.include?(tag) node.tags << tag unless node.tags.include?(tag)
node.save node.save
end end
if nodes.empty?
return node
end
return nodes.first return nodes.first
else else
return master.first return master.first