openstack/cookbook-openstack-block-storage
Code Issues Proposed changes

explicitly set rpc_backend in cinder.conf

Browse Source 
Implements: blueprint centos-rhel-for-block
Fixes: bug #1269432

The following is a default value in cinder:

rpc_backend=cinder.openstack.common.rpc.impl_kombu

Using RDO (rhel/centos) packages, this gets overridden in
/usr/share/nova/cinder-dist.conf to 'impl_qpid'.

In order to cleanly set this back to the default value (which is what we
want as a default in the cookbooks), we need to explicitly set this in
cinder.conf

Change-Id: I5bd0c6ed95a6d02202b19708f15a58ec43a2fe6c
This commit is contained in:
Darren Birkett
2014-01-15 14:10:48 +00:00
parent 52dd20137d
commit ffacb85d41
3 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
attributes/default.rb
View File

@@ -71,6 +71,12 @@ default['openstack']['block-storage']['quota_driver'] = 'cinder.quota.DbQuotaDri
default['openstack']['block-storage']['rpc_thread_pool_size'] = 64
default['openstack']['block-storage']['rpc_conn_pool_size'] = 30
default['openstack']['block-storage']['rpc_response_timeout'] = 60
case node["openstack"]["mq"]["service_type"]
when "rabbitmq"
default["openstack"]["block_storage"]["rpc_backend"] = "cinder.openstack.common.rpc.impl_kombu"
when "qpid"
default["openstack"]["block_storage"]["rpc_backend"] = "cinder.openstack.common.rpc.impl_qpid"
end
# MQ options
default['openstack']['block-storage']['mq']['service_type'] = node['openstack']['mq']['service_type']

4
spec/cinder_common_spec.rb
View File

@@ -49,6 +49,10 @@ describe "openstack-block-storage::cinder-common" do
expect(sprintf("%o", @file.mode)).to eq "644"
end
it "has rpc_backend set" do
expect(@chef_run).to render_file(@file.name).with_content("rpc_backend=cinder.openstack.common.rpc.impl_kombu")
end
it "has rpc_thread_pool_size" do
expect(@chef_run).to render_file(@file.name).with_content("rpc_thread_pool_size=64")
end

2
templates/default/cinder.conf.erb
View File

@@ -338,8 +338,8 @@ db_backend=sqlalchemy
######## defined in cinder.openstack.common.rpc ########
# rpc_backend=cinder.openstack.common.rpc.impl_kombu
#### (StrOpt) The messaging module to use, defaults to kombu.
rpc_backend=<%= node["openstack"]["block_storage"]["rpc_backend"] %>
rpc_thread_pool_size=<%= node["openstack"]["block-storage"]["rpc_thread_pool_size"] %>