summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorMasaki Matsushita <glass.saga@gmail.com>2015-05-04 17:44:05 +0900
committerMasaki Matsushita <glass.saga@gmail.com>2015-05-06 19:39:53 +0900
commit0fd962dae2162405dc8b8ee04d7901b42e74a303 (patch)
treec5a7b5daa6ca4a8c8409ec7e65fa44ffe5e2fe2d /spec
parentcb7a11a2c42c9a2a133b2f33d2cc1ddf0b1f3b2a (diff)
use LVMVolumeDriver as default.
LVMISCSIDriver is deprecated. See also: cinder/volume/drivers/lvm.py Change-Id: I08b157ee7fbb0d61c8c9ec406edf2240a9a40c1d Closes-Bug: #1451363
Notes
Notes (review): Verified+2: Jenkins Code-Review+2: Mark Vanderwiel <vanderwl@us.ibm.com> Workflow+1: Jan Klare <j.klare@x-ion.de> Submitted-by: Jenkins Submitted-at: Wed, 06 May 2015 15:26:08 +0000 Reviewed-on: https://review.openstack.org/179733 Project: stackforge/cookbook-openstack-block-storage Branch: refs/heads/master
Diffstat (limited to 'spec')
-rw-r--r--spec/cinder_common_spec.rb6
-rw-r--r--spec/volume-redhat_spec.rb2
-rw-r--r--spec/volume_spec.rb4
3 files changed, 6 insertions, 6 deletions
diff --git a/spec/cinder_common_spec.rb b/spec/cinder_common_spec.rb
index 8ed5454..4227e16 100644
--- a/spec/cinder_common_spec.rb
+++ b/spec/cinder_common_spec.rb
@@ -437,7 +437,7 @@ describe 'openstack-block-storage::cinder-common' do
437 437
438 context 'lvm settings' do 438 context 'lvm settings' do
439 before do 439 before do
440 node.set['openstack']['block-storage']['volume']['driver'] = 'cinder.volume.drivers.lvm.LVMISCSIDriver' 440 node.set['openstack']['block-storage']['volume']['driver'] = 'cinder.volume.drivers.lvm.LVMVolumeDriver'
441 end 441 end
442 442
443 %w(group clear clear_size).each do |attr| 443 %w(group clear clear_size).each do |attr|
@@ -824,7 +824,7 @@ describe 'openstack-block-storage::cinder-common' do
824 before do 824 before do
825 node.set['openstack']['block-storage']['volume']['multi_backend'] = { 825 node.set['openstack']['block-storage']['volume']['multi_backend'] = {
826 'lvm' => { 826 'lvm' => {
827 'volume_driver' => 'cinder.volume.drivers.lvm.LVMISCSIDriver', 827 'volume_driver' => 'cinder.volume.drivers.lvm.LVMVolumeDriver',
828 'volume_backend_name' => 'lvmdrv' 828 'volume_backend_name' => 'lvmdrv'
829 }, 829 },
830 'rbd' => { 830 'rbd' => {
@@ -883,7 +883,7 @@ describe 'openstack-block-storage::cinder-common' do
883 expect(chef_run).to render_file(file.name).with_content(/^enabled_backends = lvm,rbd,netapp_iscsi,netapp_nfs,ibmnas,ibmsvc,solidfire,emciscsi,vmware,gpfs$/) 883 expect(chef_run).to render_file(file.name).with_content(/^enabled_backends = lvm,rbd,netapp_iscsi,netapp_nfs,ibmnas,ibmsvc,solidfire,emciscsi,vmware,gpfs$/)
884 884
885 expect(chef_run).to render_file(file.name).with_content(/^\[lvm\]$/) 885 expect(chef_run).to render_file(file.name).with_content(/^\[lvm\]$/)
886 expect(chef_run).to render_file(file.name).with_content(/^volume_driver = cinder\.volume\.drivers\.lvm\.LVMISCSIDriver$/) 886 expect(chef_run).to render_file(file.name).with_content(/^volume_driver = cinder\.volume\.drivers\.lvm\.LVMVolumeDriver$/)
887 887
888 expect(chef_run).to render_file(file.name).with_content(/^\[rbd\]$/) 888 expect(chef_run).to render_file(file.name).with_content(/^\[rbd\]$/)
889 expect(chef_run).to render_file(file.name).with_content(/^volume_driver = cinder\.volume\.drivers\.rbd\.RBDDriver$/) 889 expect(chef_run).to render_file(file.name).with_content(/^volume_driver = cinder\.volume\.drivers\.rbd\.RBDDriver$/)
diff --git a/spec/volume-redhat_spec.rb b/spec/volume-redhat_spec.rb
index 6fe3637..8327bc6 100644
--- a/spec/volume-redhat_spec.rb
+++ b/spec/volume-redhat_spec.rb
@@ -165,7 +165,7 @@ describe 'openstack-block-storage::volume' do
165 describe 'create_vg' do 165 describe 'create_vg' do
166 let(:file) { chef_run.template('/etc/init.d/cinder-group-active') } 166 let(:file) { chef_run.template('/etc/init.d/cinder-group-active') }
167 before do 167 before do
168 node.set['openstack']['block-storage']['volume']['driver'] = 'cinder.volume.drivers.lvm.LVMISCSIDriver' 168 node.set['openstack']['block-storage']['volume']['driver'] = 'cinder.volume.drivers.lvm.LVMVolumeDriver'
169 node.set['openstack']['block-storage']['volume']['create_volume_group'] = true 169 node.set['openstack']['block-storage']['volume']['create_volume_group'] = true
170 stub_command('vgs cinder-volumes').and_return(false) 170 stub_command('vgs cinder-volumes').and_return(false)
171 end 171 end
diff --git a/spec/volume_spec.rb b/spec/volume_spec.rb
index 548b795..2b38edf 100644
--- a/spec/volume_spec.rb
+++ b/spec/volume_spec.rb
@@ -238,7 +238,7 @@ describe 'openstack-block-storage::volume' do
238 describe 'create_vg' do 238 describe 'create_vg' do
239 let(:file) { chef_run.template('/etc/init.d/cinder-group-active') } 239 let(:file) { chef_run.template('/etc/init.d/cinder-group-active') }
240 before do 240 before do
241 node.set['openstack']['block-storage']['volume']['driver'] = 'cinder.volume.drivers.lvm.LVMISCSIDriver' 241 node.set['openstack']['block-storage']['volume']['driver'] = 'cinder.volume.drivers.lvm.LVMVolumeDriver'
242 node.set['openstack']['block-storage']['volume']['create_volume_group'] = true 242 node.set['openstack']['block-storage']['volume']['create_volume_group'] = true
243 stub_command('vgs cinder-volumes').and_return(false) 243 stub_command('vgs cinder-volumes').and_return(false)
244 end 244 end
@@ -295,7 +295,7 @@ describe 'openstack-block-storage::volume' do
295 295
296 describe 'create vg on block devices' do 296 describe 'create vg on block devices' do
297 before do 297 before do
298 node.set['openstack']['block-storage']['volume']['driver'] = 'cinder.volume.drivers.lvm.LVMISCSIDriver' 298 node.set['openstack']['block-storage']['volume']['driver'] = 'cinder.volume.drivers.lvm.LVMVolumeDriver'
299 node.set['openstack']['block-storage']['volume']['create_volume_group'] = true 299 node.set['openstack']['block-storage']['volume']['create_volume_group'] = true
300 node.set['openstack']['block-storage']['volume']['create_volume_group_type'] = 'block_devices' 300 node.set['openstack']['block-storage']['volume']['create_volume_group_type'] = 'block_devices'
301 node.set['openstack']['block-storage']['volume']['block_devices'] = '/dev/sdx /dev/sdx1' 301 node.set['openstack']['block-storage']['volume']['block_devices'] = '/dev/sdx /dev/sdx1'