openstack
/
cookbook-openstack-ops-messaging
Code Issues Proposed changes

Searching on wrong environment 

We need to use chef_environment vs environment.

Change-Id: I2ceba5a49ec88f81ad763379bebbd63d9bd19bb8
This commit is contained in:
John Dewey 2013-07-11 16:40:06 -07:00
parent 95b1ab1060
commit 1abe03c3e6
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
recipes/rabbitmq-server.rb
View File

@ -43,7 +43,7 @@ node.override["rabbitmq"]["use_distro_version"] = true
if node["openstack"]["mq"]["cluster"]
node.override["rabbitmq"]["cluster"] = node["openstack"]["mq"]["cluster"]
node.override["rabbitmq"]["erlang_cookie"] = service_password "rabbit_cookie"
qs = "roles:#{rabbit_server_role} AND environment:#{node.chef_environment}"
qs = "roles:#{rabbit_server_role} AND chef_environment:#{node.chef_environment}"
node.override["rabbitmq"]["cluster_disk_nodes"] = search(:node, qs).map do |n|
"#{user}@#{n['hostname']}"
end

2
spec/spec_helper.rb
View File

@ -17,7 +17,7 @@ def ops_messaging_stubs
with("lo").
and_return "127.0.0.1"
::Chef::Recipe.any_instance.stub(:search).
with(:node, "roles:os-ops-messaging AND environment:_default").
with(:node, "roles:os-ops-messaging AND chef_environment:_default").
and_return [
{ 'hostname' => 'host1' },
{ 'hostname' => 'host2' }