commit 3fd71d68933f2c4e38ff7fa58416ec0263325a9f
author Samuel de Medeiros Queiroz <samuel@lsd.ufcg.edu.br> Sun May 03 14:54:45 2015 -0300
committer Samuel de Medeiros Queiroz <samuel@lsd.ufcg.edu.br> Wed May 27 14:27:30 2015 -0300
tree a587f811b7264232fc116c50ed77b6dbcb2426e4
parent ee3d2a8ece24efe8ee8b0304c133574967eb60d3

Honor the flag for Identity v3 API only jobs

When the property ENABLE_IDENTITY_V2 is set to
False in the local.conf file, devstack will:

* Disable the v2 API in Keystone paste config;
* Set Tempest to skip Identity v2 tests and use
  v3 auth tokens to run all the other tests;
* Set Horizon to use v3 API and v3 auth tokens;
* Register the Identity endpoint as v3.

Change-Id: I2575a516244b848e5ed461e7f488c59edc41068d

lib/keystone

diff --git a/lib/keystone b/lib/keystone
index 997bb14..de2d2ca 100644
--- a/lib/keystone
+++ b/lib/keystone
@@ -204,6 +204,12 @@
         KEYSTONE_PASTE_INI="$KEYSTONE_CONF"
     fi
 
+    if [ "$ENABLE_IDENTITY_V2" == "False" ]; then
+        # Only Identity v3 API should be available; then disable v2 pipelines
+        inidelete $KEYSTONE_PASTE_INI composite:main \\/v2.0
+        inidelete $KEYSTONE_PASTE_INI composite:admin \\/v2.0
+    fi
+
     configure_keystone_extensions
 
     # Rewrite stock ``keystone.conf``