From 5f8b3cb631688ec65629fffaf0f8b7615a16c511 Mon Sep 17 00:00:00 2001 From: Sean Dague Date: Thu, 11 Jun 2015 10:34:45 -0400 Subject: [PATCH] revert to eventlet based keystone upgrade for juno -> kilo While both juno and kilo keystone in devstack support wsgi, they don't support code only upgrade. This reverts back to the eventlet based upgrade testing for this transition. Change the testing variable from GRENADE_BASE_BRANCH to GRENADE_NEW_BRANCH because it looks like BASE_BRANCH is not always exported. Change-Id: Ic9174f6f959f95eabf76ba8b8a19729898194a61 --- devstack-vm-gate.sh | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/devstack-vm-gate.sh b/devstack-vm-gate.sh index a9c0d4f3..ea39f22c 100755 --- a/devstack-vm-gate.sh +++ b/devstack-vm-gate.sh @@ -320,12 +320,21 @@ 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 + case $GRENADE_NEW_BRANCH in "stable/icehouse") ;& "stable/juno") echo "KEYSTONE_USE_MOD_WSGI=False" >> "$localrc_file" ;; + "stable/kilo") + # while both juno and kilo can run under wsgi, they + # can't run a code only upgrade because the + # configuration assumes copying python files around + # during config stage. This might be addressed by + # keystone team later, hence separate comment and code + # block. + echo "KEYSTONE_USE_MOD_WSGI=False" >> "$localrc_file" + ;; esac fi