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

Clean up cookbook for bp/clean-up-attr-for-mq-and-db 

This change removes the attributes we'll be moving to openstack-common
and changes reference of those attributes to reflect new (more
consistent) namespace.

Change-Id: I1602d2e6241a62b188d64fa760786fb95a734404
Implements: blueprint clean-up-attr-for-mq-and-db
This commit is contained in:
Matt Thompson 2014-01-16 16:55:21 +00:00 committed by Hugh Saunders
parent fead3aab95
commit ed732f0832
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
attributes/default.rb
View File

@ -21,10 +21,3 @@
default['openstack']['mq']['bind_interface'] = 'lo'
default['openstack']['mq']['cluster'] = false
%w[block-storage compute image metering network].each do |service|
default['openstack'][service]['rabbit']['host'] = node['openstack']['mq']['listen']
default['openstack'][service]['rabbit']['port'] = node['openstack']['mq']['port']
default['openstack'][service]['rabbit']['username'] = node['openstack']['mq']['user']
default['openstack'][service]['rabbit']['vhost'] = node['openstack']['mq']['vhost']
end

6
spec/rabbitmq-server_spec.rb
View File

@ -31,9 +31,9 @@ describe 'openstack-ops-messaging::rabbitmq-server' do
expect(chef_run.node['openstack']['mq']['port']).to eql '4242'
expect(chef_run.node['openstack']['mq']['user']).to eql 'foo'
expect(chef_run.node['openstack']['mq']['vhost']).to eql '/bar'
expect(chef_run.node['openstack']['image']['rabbit']['port']).to eql '4242'
expect(chef_run.node['openstack']['image']['rabbit']['username']).to eql 'foo'
expect(chef_run.node['openstack']['image']['rabbit']['vhost']).to eql '/bar'
expect(chef_run.node['openstack']['mq']['image']['rabbit']['port']).to eql '4242'
expect(chef_run.node['openstack']['mq']['image']['rabbit']['userid']).to eql 'foo'
expect(chef_run.node['openstack']['mq']['image']['rabbit']['vhost']).to eql '/bar'
end
describe 'cluster' do