Merge "Fix python3 issue in devstack plugin"

This commit is contained in:
Zuul 2019-11-26 04:26:52 +00:00 committed by Gerrit Code Review
commit 89e70cd263

View File

@ -1,6 +1,7 @@
# plugin.sh - DevStack plugin.sh dispatch script zun-ui # plugin.sh - DevStack plugin.sh dispatch script zun-ui
ZUN_UI_DIR=$(cd $(dirname $BASH_SOURCE)/.. && pwd) ZUN_UI_DIR=$(cd $(dirname $BASH_SOURCE)/.. && pwd)
PYTHON=${PYTHON:-python}
function install_zun_ui { function install_zun_ui {
# NOTE(shu-mutou): workaround for devstack bug: 1540328 # NOTE(shu-mutou): workaround for devstack bug: 1540328
@ -19,7 +20,7 @@ function configure_zun_ui {
# NOTE: If locale directory does not exist, compilemessages will fail, # NOTE: If locale directory does not exist, compilemessages will fail,
# so check for an existence of locale directory is required. # so check for an existence of locale directory is required.
if [ -d ${ZUN_UI_DIR}/zun_ui/locale ]; then if [ -d ${ZUN_UI_DIR}/zun_ui/locale ]; then
(cd ${ZUN_UI_DIR}/zun_ui; DJANGO_SETTINGS_MODULE=openstack_dashboard.settings ../manage.py compilemessages) (cd ${ZUN_UI_DIR}/zun_ui; DJANGO_SETTINGS_MODULE=openstack_dashboard.settings $PYTHON ../manage.py compilemessages)
fi fi
} }