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

Merge "use LVMVolumeDriver as default. LVMISCSIDriver is deprecated. See also: cinder/volume/drivers/lvm.py"

Browse Source
This commit is contained in:
Jenkins
2015-05-06 15:26:08 +00:00
committed by Gerrit Code Review
parent cba98483b2 0fd962dae2
commit b4ae9f3dec
7 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spec/cinder_common_spec.rb
View File

@@ -481,7 +481,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|
@@ -868,7 +868,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' => {
@@ -927,7 +927,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$/)