Skip to content

Commit 5200e35

Browse files
committed
tempest: enable multiattach for NetApp + LVMIscsi
just disable it for the backends that are known to not support it
1 parent fc2d8e1 commit 5200e35

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

chef/cookbooks/tempest/recipes/config.rb

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -414,18 +414,24 @@
414414
storage_protocol = "iSCSI"
415415
vendor_name = "Open Source"
416416
cinder_snapshot = true
417+
418+
use_multiattach = true
419+
417420
# Currently broken in general, even with LVM
418421
use_attach_encrypted_volume = false
419422
cinders[0][:cinder][:volumes].each do |volume|
420423
if volume[:backend_driver] == "rbd"
421424
storage_protocol = "ceph"
425+
use_multiattach = false
422426
# no encryption support for rbd-backed volumes
423427
use_attach_encrypted_volume = false
424428
break
425429
elsif volume[:backend_driver] == "emc"
430+
use_multiattach = false
426431
vendor_name = "EMC"
427432
break
428433
elsif volume[:backend_driver] == "eqlx"
434+
use_multiattach = false
429435
vendor_name = "Dell"
430436
break
431437
elsif volume[:backend_driver] == "eternus"
@@ -438,10 +444,12 @@
438444
break
439445
elsif volume[:backend_driver] == "nfs"
440446
storage_protocol = "nfs"
447+
use_multiattach = false
441448
cinder_snapshot = volume[:nfs][:nfs_snapshot]
442449
break
443450
elsif volume[:backend_driver] == "vmware"
444451
vendor_name = "VMware"
452+
use_multiattach = false
445453
storage_protocol = "LSI Logic SCSI"
446454
break
447455
end
@@ -528,6 +536,7 @@
528536
use_rescue: use_rescue,
529537
use_resize: use_resize,
530538
use_suspend: use_suspend,
539+
use_multiattach: use_multiattach,
531540
use_vnc: use_vnc,
532541
use_livemigration: use_livemigration,
533542
use_attach_encrypted_volume: use_attach_encrypted_volume,

chef/cookbooks/tempest/templates/default/tempest.conf.erb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,7 @@ block_migration_for_live_migration = true
6060
vnc_console = <%= @use_vnc %>
6161
rescue = <%= @use_rescue %>
6262
personality = True
63-
# only supported by LVM driver
64-
# see https://docs.openstack.org/cinder/rocky/reference/support-matrix.html#operation_multi_attach
65-
volume_multiattach = False
63+
volume_multiattach = <%= @use_multiattach %>
6664
swap_volume = True
6765
attach_encrypted_volume = <%= @use_attach_encrypted_volume %>
6866
api_extensions = all

0 commit comments

Comments
 (0)