Skip to content

Commit

Permalink
tempest: enable multiattach for NetApp + LVMIscsi
Browse files Browse the repository at this point in the history
just disable it for the backends that are known to not support it
  • Loading branch information
dirkmueller committed May 9, 2019
1 parent fc2d8e1 commit 5200e35
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 3 deletions.
9 changes: 9 additions & 0 deletions chef/cookbooks/tempest/recipes/config.rb
Original file line number Diff line number Diff line change
Expand Up @@ -414,18 +414,24 @@
storage_protocol = "iSCSI"
vendor_name = "Open Source"
cinder_snapshot = true

use_multiattach = true

# Currently broken in general, even with LVM
use_attach_encrypted_volume = false
cinders[0][:cinder][:volumes].each do |volume|
if volume[:backend_driver] == "rbd"
storage_protocol = "ceph"
use_multiattach = false
# no encryption support for rbd-backed volumes
use_attach_encrypted_volume = false
break
elsif volume[:backend_driver] == "emc"
use_multiattach = false
vendor_name = "EMC"
break
elsif volume[:backend_driver] == "eqlx"
use_multiattach = false
vendor_name = "Dell"
break
elsif volume[:backend_driver] == "eternus"
Expand All @@ -438,10 +444,12 @@
break
elsif volume[:backend_driver] == "nfs"
storage_protocol = "nfs"
use_multiattach = false
cinder_snapshot = volume[:nfs][:nfs_snapshot]
break
elsif volume[:backend_driver] == "vmware"
vendor_name = "VMware"
use_multiattach = false
storage_protocol = "LSI Logic SCSI"
break
end
Expand Down Expand Up @@ -528,6 +536,7 @@
use_rescue: use_rescue,
use_resize: use_resize,
use_suspend: use_suspend,
use_multiattach: use_multiattach,
use_vnc: use_vnc,
use_livemigration: use_livemigration,
use_attach_encrypted_volume: use_attach_encrypted_volume,
Expand Down
4 changes: 1 addition & 3 deletions chef/cookbooks/tempest/templates/default/tempest.conf.erb
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,7 @@ block_migration_for_live_migration = true
vnc_console = <%= @use_vnc %>
rescue = <%= @use_rescue %>
personality = True
# only supported by LVM driver
# see https://docs.openstack.org/cinder/rocky/reference/support-matrix.html#operation_multi_attach
volume_multiattach = False
volume_multiattach = <%= @use_multiattach %>
swap_volume = True
attach_encrypted_volume = <%= @use_attach_encrypted_volume %>
api_extensions = all
Expand Down

0 comments on commit 5200e35

Please sign in to comment.