Merge "Patch to skip test_volume_swap on yoga-core-ceph-local-non-dvr-crypt-volume-barbican environment." into mcp/caracal
diff --git a/tempest/api/compute/admin/test_volume_swap.py b/tempest/api/compute/admin/test_volume_swap.py
index 9576b74..fa416b1 100644
--- a/tempest/api/compute/admin/test_volume_swap.py
+++ b/tempest/api/compute/admin/test_volume_swap.py
@@ -36,6 +36,10 @@
raise cls.skipException("Cinder is not available")
if not CONF.compute_feature_enabled.swap_volume:
raise cls.skipException("Swapping volumes is not supported.")
+ if CONF.compute_feature_enabled.attach_encrypted_volume:
+ raise cls.skipException(
+ 'Volume swap is not available for OS configurations '
+ 'with crypted volumes.')
def wait_for_server_volume_swap(self, server_id, old_volume_id,
new_volume_id):