From 7fb030e6de16d6aa7c16591b5c3df837842f34ef Mon Sep 17 00:00:00 2001 From: Fei Long Wang Date: Tue, 15 Nov 2016 19:53:00 +1300 Subject: [PATCH] Fix zaqar client gate It's related to devstack bug bug: 1540328, where devstack install 'test-requirements' but should not do it for zaqar-ui project as it installs Horizon from url. Remove following two 'mv' commands when mentioned bug is fixed. Change-Id: Ib4d0abe3b083d996556f615943d3b1185c9f882a --- devstack/plugin.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 3368cd917..63b1f4bce 100755 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -203,11 +203,17 @@ function install_zaqar { function install_zaqarui { git_clone $ZAQARUI_REPO $ZAQARUI_DIR $ZAQARUI_BRANCH + # NOTE(flwang): Workaround for devstack bug: 1540328 + # where devstack install 'test-requirements' but should not do it + # for zaqar-ui project as it installs Horizon from url. + # Remove following two 'mv' commands when mentioned bug is fixed. + mv $ZAQARUI_DIR/test-requirements.txt $ZAQARUI_DIR/_test-requirements.txt setup_develop $ZAQARUI_DIR + mv $ZAQARUI_DIR/_test-requirements.txt $ZAQARUI_DIR/test-requirements.txt ln -fs $ZAQARUI_DIR/zaqar_ui/enabled/_1510_project_messaging_group.py $HORIZON_DIR/openstack_dashboard/local/enabled/_1510_project_messaging_group.py ln -fs $ZAQARUI_DIR/zaqar_ui/enabled/_1520_project_queues.py $HORIZON_DIR/openstack_dashboard/local/enabled/_1520_project_queues.py - if [ -d $ZAQARUI_DIR/zaqar_ui/locale ]; then - (cd $ZAQARUI_DIR/zaqar_ui; DJANGO_SETTINGS_MODULE=openstack_dashboard.settings ../manage.py compilemessages) + if [ -d $ZAQARUI_DIR/zaqar-ui/locale ]; then + (cd $ZAQARUI_DIR/zaqar-ui; DJANGO_SETTINGS_MODULE=openstack_dashboard.settings ../manage.py compilemessages) fi }