From a892daf4768ac1e188f6d477f1fc7c6ea6c1e1e8 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Tue, 31 May 2016 11:22:59 -0500 Subject: [PATCH] Make sahara_image context glance v2 compatible Change-Id: I363d4ddfbeed42bb19bc1708ce858e1340613bd6 --- rally/plugins/openstack/context/sahara/sahara_image.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/rally/plugins/openstack/context/sahara/sahara_image.py b/rally/plugins/openstack/context/sahara/sahara_image.py index c83133d4..1b7c8ad3 100644 --- a/rally/plugins/openstack/context/sahara/sahara_image.py +++ b/rally/plugins/openstack/context/sahara/sahara_image.py @@ -92,7 +92,13 @@ class SaharaImage(context.Context): image = clients.glance().images.get(image_uuid) - if not image.is_public: + visibility = None + if hasattr(image, "is_public"): + visibility = "public" if image.is_public else "private" + else: + visibility = image["visibility"] + + if visibility != "public": raise exceptions.BenchmarkSetupFailure( "Image provided in the Sahara context should be public.") image_id = image_uuid