Merge "Revert "only force off KEYSTONE_USE_WSGI up until kilo""

This commit is contained in:
Jenkins
2015-05-26 15:56:25 +00:00
committed by Gerrit Code Review

View File

@@ -320,13 +320,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