Merge "change default cinder.volume.driver"

This commit is contained in:
Jenkins
2014-01-16 21:30:36 +00:00
committed by Gerrit Code Review
2 changed files with 5 additions and 1 deletions

View File

@@ -161,7 +161,7 @@ default['openstack']['block-storage']['cron']['minute'] = '00'
default['openstack']['block-storage']['cron']['audit_logfile'] = '/var/log/cinder/audit.log'
default['openstack']['block-storage']['volume']['state_path'] = '/var/lib/cinder'
default['openstack']['block-storage']['volume']['driver'] = 'cinder.volume.driver.ISCSIDriver'
default['openstack']['block-storage']['volume']['driver'] = 'cinder.volume.drivers.lvm.LVMISCSIDriver'
default['openstack']['block-storage']['volume']['volume_group'] = 'cinder-volumes'
default['openstack']['block-storage']['volume']['volume_group_size'] = 40
default['openstack']['block-storage']['volume']['create_volume_group'] = false

View File

@@ -53,6 +53,10 @@ describe "openstack-block-storage::cinder-common" do
expect(@chef_run).to render_file(@file.name).with_content("rpc_backend=cinder.openstack.common.rpc.impl_kombu")
end
it "has correct volume.driver set" do
expect(@chef_run).to render_file(@file.name).with_content("volume_driver=cinder.volume.drivers.lvm.LVMISCSIDriver")
end
it "has rpc_thread_pool_size" do
expect(@chef_run).to render_file(@file.name).with_content("rpc_thread_pool_size=64")
end