From 04609ff0360ec0cf722c01881301fe549d2a374d Mon Sep 17 00:00:00 2001 From: Darren Birkett Date: Wed, 15 Jan 2014 14:21:49 +0000 Subject: [PATCH] change default cinder.volume.driver Fixes: bug #1269438 New lvm iscsi driver path is: cinder.volume.drivers.lvm.LVMISCSIDriver Change-Id: I3427e80c78ec52a6b02cd42d25f425e03e15f01f --- attributes/default.rb | 2 +- spec/cinder_common_spec.rb | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/attributes/default.rb b/attributes/default.rb index 8e559e8..f7a18e4 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -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 diff --git a/spec/cinder_common_spec.rb b/spec/cinder_common_spec.rb index ae0014f..29d32b5 100644 --- a/spec/cinder_common_spec.rb +++ b/spec/cinder_common_spec.rb @@ -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