commit ff31a13d0f43d9fb126e80d4b42b8520fb1b83c5
author Jenkins <jenkins@review.openstack.org> Mon Jan 11 14:38:51 2016 +0000
committer Gerrit Code Review <review@openstack.org> Mon Jan 11 14:38:51 2016 +0000
tree 2e1e5f5d257019b3f49aaddedf57f294b17540f2
parent 7701ff4c54e77b68117ea65499a115d37cf183cc
parent 1d2e40f76469e64283a5f828d84256436334c75f

Merge "Scenario manager: don't access glance_client if Glance is not available"

tempest/scenario/manager.py

diff --git a/tempest/scenario/manager.py b/tempest/scenario/manager.py
index 03cabbc..bb4e521 100644
--- a/tempest/scenario/manager.py
+++ b/tempest/scenario/manager.py
@@ -49,8 +49,9 @@
         cls.flavors_client = cls.manager.flavors_client
         cls.compute_floating_ips_client = (
             cls.manager.compute_floating_ips_client)
-        # Glance image client v1
-        cls.image_client = cls.manager.image_client
+        if CONF.service_available.glance:
+            # Glance image client v1
+            cls.image_client = cls.manager.image_client
         # Compute image client
         cls.compute_images_client = cls.manager.compute_images_client
         cls.keypairs_client = cls.manager.keypairs_client