From 0911c9f3de347b6cb70e15bb2d6f0b969374f906 Mon Sep 17 00:00:00 2001 From: Sean Dague Date: Mon, 20 Apr 2015 14:41:15 -0400 Subject: [PATCH] only force off KEYSTONE_USE_WSGI up until kilo Keystone should be allowed to run in the wsgi mode in grenade, so stop forcing this off for kilo and beyond upgrade testing. Note: we also really should have an upgrade path from eventlet -> wsgi tested, but that has not been done by the keystone team yet. Change-Id: Ia4801bcd2278f39b17acb0883beec75b991b32df --- devstack-vm-gate.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/devstack-vm-gate.sh b/devstack-vm-gate.sh index 1ac3797d..dab20c13 100755 --- a/devstack-vm-gate.sh +++ b/devstack-vm-gate.sh @@ -299,7 +299,13 @@ EOF fi # keystone deployed with mod wsgi cannot be upgraded or migrated # until https://launchpad.net/bugs/1365105 is resolved. - echo "KEYSTONE_USE_MOD_WSGI=False" >> "$localrc_file" + case $GRENADE_BASE_BRANCH in + "stable/icehouse") + ;& + "stable/juno") + echo "KEYSTONE_USE_MOD_WSGI=False" >> "$localrc_file" + ;; + esac fi if [[ "$DEVSTACK_GATE_TEMPEST_LARGE_OPS" -eq "1" ]]; then