openstack/cookbook-openstack-compute
Code Issues Proposed changes

search

Browse Source
This commit is contained in:
Joseph W. Breu
2012-04-23 15:41:06 -05:00
parent 57993ea137
commit 6e180f27cc
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
recipes/api-ec2.rb
View File

@@ -59,8 +59,8 @@ if Chef::Config[:solo]
Chef::Log.warn("This recipe uses search. Chef Solo does not support search.")
else
# Lookup keystone api ip address
keystone, something, result_count = Chef::Search::Query.new.search(:node, "roles:keystone AND chef_environment:#{node.chef_environment}")
if result_count > 0
keystone, something, arbitrary_value = Chef::Search::Query.new.search(:node, "roles:keystone AND chef_environment:#{node.chef_environment}")
if keystone.length > 0
Chef::Log.info("Using Keystone attributes from SEARCH")
keystone_api_ip = keystone[0]['keystone']['api_ipaddress']
keystone_service_port = keystone[0]['keystone']['service_port']

4
recipes/api-metadata.rb
View File

@@ -59,8 +59,8 @@ if Chef::Config[:solo]
Chef::Log.warn("This recipe uses search. Chef Solo does not support search.")
else
# Lookup keystone api ip address
keystone, something, result_count = Chef::Search::Query.new.search(:node, "roles:keystone AND chef_environment:#{node.chef_environment}")
if result_count > 0
keystone, something, arbitrary_value = Chef::Search::Query.new.search(:node, "roles:keystone AND chef_environment:#{node.chef_environment}")
if keystone.length > 0
Chef::Log.info("Using Keystone attributes from SEARCH")
keystone_api_ip = keystone[0]['keystone']['api_ipaddress']
keystone_service_port = keystone[0]['keystone']['service_port']

4
recipes/api-os-compute.rb
View File

@@ -59,8 +59,8 @@ if Chef::Config[:solo]
Chef::Log.warn("This recipe uses search. Chef Solo does not support search.")
else
# Lookup keystone api ip address
keystone, something, result_count = Chef::Search::Query.new.search(:node, "roles:keystone AND chef_environment:#{node.chef_environment}")
if result_count > 0
keystone, something, arbitrary_value = Chef::Search::Query.new.search(:node, "roles:keystone AND chef_environment:#{node.chef_environment}")
if keystone.length > 0
Chef::Log.info("Using Keystone attributes from SEARCH")
keystone_api_ip = keystone[0]['keystone']['api_ipaddress']
keystone_service_port = keystone[0]['keystone']['service_port']

4
recipes/volume.rb
View File

@@ -38,8 +38,8 @@ if Chef::Config[:solo]
Chef::Log.warn("This recipe uses search. Chef Solo does not support search.")
else
# Lookup keystone api ip address
keystone, something, result_count = Chef::Search::Query.new.search(:node, "roles:keystone AND chef_environment:#{node.chef_environment}")
if result_count > 0
keystone, something, arbitrary_value = Chef::Search::Query.new.search(:node, "roles:keystone AND chef_environment:#{node.chef_environment}")
if keystone.length > 0
Chef::Log.info("Using Keystone attributes from SEARCH")
keystone_api_ip = keystone[0]['keystone']['api_ipaddress']
keystone_admin_port = keystone[0]['keystone']['admin_port']