commit baa6e9ad87306b30ca42fdc82f7cf6fa2a0b6900
author Jenkins <jenkins@review.openstack.org> Wed Jul 19 05:39:53 2017 +0000
committer Gerrit Code Review <review@openstack.org> Wed Jul 19 05:39:53 2017 +0000
tree 6c94c91854080ac92cfa3472b2b5bfdd7596c1f9
parent 1c39a2f937967b8b75d86368f0d7202982add133
parent 7628cb2f5d5d928afa3abaa7a6813a41d4c05038

Merge "Unix style line ending"

tempest/scenario/test_volume_boot_pattern.py

diff --git a/tempest/scenario/test_volume_boot_pattern.py b/tempest/scenario/test_volume_boot_pattern.py
index 96d0474..19bc311 100644
--- a/tempest/scenario/test_volume_boot_pattern.py
+++ b/tempest/scenario/test_volume_boot_pattern.py
@@ -229,9 +229,8 @@
         self._delete_server(instance)
 
     @decorators.idempotent_id('cb78919a-e553-4bab-b73b-10cf4d2eb125')
-    @testtools.skipIf(CONF.volume.storage_protocol.lower() in ['ceph', 'nfs'],
-                      'Currently, {} does not support volume encryption'
-                      .format(CONF.volume.storage_protocol))
+    @testtools.skipUnless(CONF.compute_feature_enabled.attach_encrypted_volume,
+                          'Encrypted volume attach is not supported')
     @test.services('compute', 'volume')
     def test_boot_server_from_encrypted_volume_luks(self):
         # Create an encrypted volume