From ccbfaa83ac82f14a9d7d9cc658d2899d41fc9dda Mon Sep 17 00:00:00 2001
From: Matt Riedemann <mriedem@us.ibm.com>
Date: Fri, 22 May 2015 17:04:34 +0000
Subject: [PATCH] Revert "only force off KEYSTONE_USE_WSGI up until kilo"

This reverts commit 0911c9f3de347b6cb70e15bb2d6f0b969374f906

This is breaking grenade jobs on stable/kilo changes.

Change-Id: I670d8be337eb7326828aa142765c14600e5024cc
Closes-Bug: #1456835
---
 devstack-vm-gate.sh | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/devstack-vm-gate.sh b/devstack-vm-gate.sh
index dab20c13..1ac3797d 100755
--- a/devstack-vm-gate.sh
+++ b/devstack-vm-gate.sh
@@ -299,13 +299,7 @@ EOF
         fi
         # keystone deployed with mod wsgi cannot be upgraded or migrated
         # until https://launchpad.net/bugs/1365105 is resolved.
-        case $GRENADE_BASE_BRANCH in
-            "stable/icehouse")
-                ;&
-            "stable/juno")
-                echo "KEYSTONE_USE_MOD_WSGI=False" >> "$localrc_file"
-                ;;
-        esac
+        echo "KEYSTONE_USE_MOD_WSGI=False" >> "$localrc_file"
     fi
 
     if [[ "$DEVSTACK_GATE_TEMPEST_LARGE_OPS" -eq "1" ]]; then