Merge "Skip ServersTestBootFromVolume for Ironic" into mcp/xenial/rocky
diff --git a/tempest/api/compute/servers/test_create_server.py b/tempest/api/compute/servers/test_create_server.py
index 4f0dbad..846f3be 100644
--- a/tempest/api/compute/servers/test_create_server.py
+++ b/tempest/api/compute/servers/test_create_server.py
@@ -162,6 +162,12 @@
@classmethod
def skip_checks(cls):
super(ServersTestBootFromVolume, cls).skip_checks()
+ msg = None
if not utils.get_service_list()['volume']:
msg = "Volume service not enabled."
+ # The tests are not launched in upstream and not working with Ironic
+ if (hasattr(CONF.service_available, 'ironic') and
+ CONF.service_available.ironic):
+ msg = "Volume tests are not available for ironic."
+ if msg is not None:
raise cls.skipException(msg)