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
This commit is contained in:
Sean Dague
2015-06-11 10:34:45 -04:00
parent c94fad83ff
commit 5f8b3cb631

View File

@@ -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