summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-05-06 15:26:08 +0000
committerGerrit Code Review <review@openstack.org>2015-05-06 15:26:08 +0000
commitb4ae9f3deca43babcbf93d5dc3c45e5d182eed6f (patch)
treea22d7892a3f86d5c1af384d2a43444bc77b14f95 /spec
parentcba98483b21c4e35d771977ac9bee25bece73634 (diff)
parent0fd962dae2162405dc8b8ee04d7901b42e74a303 (diff)
Merge "use LVMVolumeDriver as default. LVMISCSIDriver is deprecated. See also: cinder/volume/drivers/lvm.py"
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 385c80c..c92f09c 100644
--- a/spec/cinder_common_spec.rb
+++ b/spec/cinder_common_spec.rb
@@ -481,7 +481,7 @@ describe 'openstack-block-storage::cinder-common' do
481 481
482 context 'lvm settings' do 482 context 'lvm settings' do
483 before do 483 before do
484 node.set['openstack']['block-storage']['volume']['driver'] = 'cinder.volume.drivers.lvm.LVMISCSIDriver' 484 node.set['openstack']['block-storage']['volume']['driver'] = 'cinder.volume.drivers.lvm.LVMVolumeDriver'
485 end 485 end
486 486
487 %w(group clear clear_size).each do |attr| 487 %w(group clear clear_size).each do |attr|
@@ -868,7 +868,7 @@ describe 'openstack-block-storage::cinder-common' do
868 before do 868 before do
869 node.set['openstack']['block-storage']['volume']['multi_backend'] = { 869 node.set['openstack']['block-storage']['volume']['multi_backend'] = {
870 'lvm' => { 870 'lvm' => {
871 'volume_driver' => 'cinder.volume.drivers.lvm.LVMISCSIDriver', 871 'volume_driver' => 'cinder.volume.drivers.lvm.LVMVolumeDriver',
872 'volume_backend_name' => 'lvmdrv' 872 'volume_backend_name' => 'lvmdrv'
873 }, 873 },
874 'rbd' => { 874 'rbd' => {
@@ -927,7 +927,7 @@ describe 'openstack-block-storage::cinder-common' do
927 expect(chef_run).to render_file(file.name).with_content(/^enabled_backends = lvm,rbd,netapp_iscsi,netapp_nfs,ibmnas,ibmsvc,solidfire,emciscsi,vmware,gpfs$/) 927 expect(chef_run).to render_file(file.name).with_content(/^enabled_backends = lvm,rbd,netapp_iscsi,netapp_nfs,ibmnas,ibmsvc,solidfire,emciscsi,vmware,gpfs$/)
928 928
929 expect(chef_run).to render_file(file.name).with_content(/^\[lvm\]$/) 929 expect(chef_run).to render_file(file.name).with_content(/^\[lvm\]$/)
930 expect(chef_run).to render_file(file.name).with_content(/^volume_driver = cinder\.volume\.drivers\.lvm\.LVMISCSIDriver$/) 930 expect(chef_run).to render_file(file.name).with_content(/^volume_driver = cinder\.volume\.drivers\.lvm\.LVMVolumeDriver$/)
931 931
932 expect(chef_run).to render_file(file.name).with_content(/^\[rbd\]$/) 932 expect(chef_run).to render_file(file.name).with_content(/^\[rbd\]$/)
933 expect(chef_run).to render_file(file.name).with_content(/^volume_driver = cinder\.volume\.drivers\.rbd\.RBDDriver$/) 933 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'