use LVMVolumeDriver as default.

LVMISCSIDriver is deprecated.
See also: cinder/volume/drivers/lvm.py

Change-Id: I08b157ee7fbb0d61c8c9ec406edf2240a9a40c1d
Closes-Bug: #1451363
This commit is contained in:
Masaki Matsushita
2015-05-04 17:44:05 +09:00
parent cb7a11a2c4
commit 0fd962dae2
7 changed files with 14 additions and 14 deletions

View File

@@ -437,7 +437,7 @@ describe 'openstack-block-storage::cinder-common' do
context 'lvm settings' do
before do
node.set['openstack']['block-storage']['volume']['driver'] = 'cinder.volume.drivers.lvm.LVMISCSIDriver'
node.set['openstack']['block-storage']['volume']['driver'] = 'cinder.volume.drivers.lvm.LVMVolumeDriver'
end
%w(group clear clear_size).each do |attr|
@@ -824,7 +824,7 @@ describe 'openstack-block-storage::cinder-common' do
before do
node.set['openstack']['block-storage']['volume']['multi_backend'] = {
'lvm' => {
'volume_driver' => 'cinder.volume.drivers.lvm.LVMISCSIDriver',
'volume_driver' => 'cinder.volume.drivers.lvm.LVMVolumeDriver',
'volume_backend_name' => 'lvmdrv'
},
'rbd' => {
@@ -883,7 +883,7 @@ describe 'openstack-block-storage::cinder-common' do
expect(chef_run).to render_file(file.name).with_content(/^enabled_backends = lvm,rbd,netapp_iscsi,netapp_nfs,ibmnas,ibmsvc,solidfire,emciscsi,vmware,gpfs$/)
expect(chef_run).to render_file(file.name).with_content(/^\[lvm\]$/)
expect(chef_run).to render_file(file.name).with_content(/^volume_driver = cinder\.volume\.drivers\.lvm\.LVMISCSIDriver$/)
expect(chef_run).to render_file(file.name).with_content(/^volume_driver = cinder\.volume\.drivers\.lvm\.LVMVolumeDriver$/)
expect(chef_run).to render_file(file.name).with_content(/^\[rbd\]$/)
expect(chef_run).to render_file(file.name).with_content(/^volume_driver = cinder\.volume\.drivers\.rbd\.RBDDriver$/)