From 5200e35e727eb4119bd592884f81e69f5e172d1a Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Tue, 16 Apr 2019 19:27:32 +0200
Subject: [PATCH] tempest: enable multiattach for NetApp + LVMIscsi

just disable it for the backends that are known to not support it
---
 chef/cookbooks/tempest/recipes/config.rb                 | 9 +++++++++
 .../cookbooks/tempest/templates/default/tempest.conf.erb | 4 +---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/chef/cookbooks/tempest/recipes/config.rb b/chef/cookbooks/tempest/recipes/config.rb
index 78a4845869..118e61c2eb 100644
--- a/chef/cookbooks/tempest/recipes/config.rb
+++ b/chef/cookbooks/tempest/recipes/config.rb
@@ -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"
@@ -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
@@ -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,
diff --git a/chef/cookbooks/tempest/templates/default/tempest.conf.erb b/chef/cookbooks/tempest/templates/default/tempest.conf.erb
index 26fbebe4b9..157f825c47 100644
--- a/chef/cookbooks/tempest/templates/default/tempest.conf.erb
+++ b/chef/cookbooks/tempest/templates/default/tempest.conf.erb
@@ -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