commit 22c695f08a82d527668ef906e11089e6b0046a50
author Flavio Percoco <flaper87@gmail.com> Wed May 11 12:49:07 2016 -0500
committer Matt Riedemann <mriedem@us.ibm.com> Fri Jun 03 14:55:26 2016 -0400
tree 1e04aab0a21cd8edc6b558c6f853b6d7d9d66217
parent b1bb5380dc2bb6e3710bd5d60c83dd08ff42d581

Have a way to disable Glance v1 in devstack

As part of the process of deprecating Glance's V1, the glance team would
like to start testing V2-only environments. Therefore, this change
provides a way to force other services to use V2.

Change-Id: I87e77d07964eac01e9a796817cbc88bd6e59c721

lib/tempest

diff --git a/lib/tempest b/lib/tempest
index e556935..19042ef 100644
--- a/lib/tempest
+++ b/lib/tempest
@@ -292,6 +292,9 @@
 
     # Image Features
     iniset $TEMPEST_CONFIG image-feature-enabled deactivate_image True
+    if [ "$GLANCE_V1_ENABLED" != "True" ]; then
+        iniset $TEMPEST_CONFIG image-feature-enabled api_v1 False
+    fi
 
     # Compute
     iniset $TEMPEST_CONFIG compute ssh_user ${DEFAULT_INSTANCE_USER:-cirros} # DEPRECATED