openstack
/
cookbook-openstack-compute
Code Issues Proposed changes

Use correct rbd pool for nova compute 

The libvirt option "images_rbd_pool" must refer to the pool for
instances instead of the pool for glance.

Change-Id: Ib384be4e4ee293118c427562d57e01c8de65fdd8
This commit is contained in:
Jens Rosenboom 2015-06-04 15:46:35 +02:00
parent ef40354293
commit f81ce175e2
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spec/nova-common_spec.rb
View File

@ -770,11 +770,11 @@ describe 'openstack-compute::nova-common' do
node.set['openstack']['compute']['libvirt']['images_type'] = 'rbd'
end
describe 'default rdb settings' do
describe 'default rbd settings' do
it 'sets the libvirt * options correctly' do
[
/^images_type=rbd$/,
/^images_rbd_pool=images$/,
/^images_rbd_pool=instances$/,
%r{^images_rbd_ceph_conf=/etc/ceph/ceph.conf$},
/^rbd_user=cinder$/,
/^rbd_secret_uuid=00000000-0000-0000-0000-000000000000$/
@ -788,7 +788,7 @@ describe 'openstack-compute::nova-common' do
describe 'override rbd settings' do
before do
node.set['openstack']['compute']['libvirt']['images_type'] = 'rbd'
node.set['openstack']['compute']['libvirt']['rbd']['glance']['pool'] = 'myrbd'
node.set['openstack']['compute']['libvirt']['rbd']['nova']['pool'] = 'myrbd'
node.set['openstack']['compute']['libvirt']['rbd']['ceph_conf'] = '/etc/myceph/ceph.conf'
end

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

@ -682,7 +682,7 @@ images_volume_group=<%= node['openstack']['compute']['libvirt']['volume_group']
sparse_logical_volumes=<%= node['openstack']['compute']['libvirt']['sparse_logical_volumes'] %>
<% elsif node['openstack']['compute']['libvirt']['images_type'] == 'rbd' -%>
images_rbd_pool=<%= node['openstack']['compute']['libvirt']['rbd']['glance']['pool'] %>
images_rbd_pool=<%= node['openstack']['compute']['libvirt']['rbd']['nova']['pool'] %>
images_rbd_ceph_conf=<%= node['openstack']['compute']['libvirt']['rbd']['ceph_conf'] %>
#