From 9d9147a189a2cf3bbeabcd6993a6c767b4aca9f0 Mon Sep 17 00:00:00 2001 From: Fei Long Wang Date: Sat, 8 Oct 2016 19:24:00 +1300 Subject: [PATCH] Enanble Zaqar-UI in devstack Change-Id: Ibc783bb6f0c86528ec49cb9abedc247b49580858 --- devstack/plugin.sh | 15 +++++++++++++++ devstack/settings | 4 ++++ 2 files changed, 19 insertions(+) diff --git a/devstack/plugin.sh b/devstack/plugin.sh index c127ab170..3368cd917 100755 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -17,6 +17,7 @@ # stack.sh # --------- # install_zaqar +# install_zaqarui # configure_zaqar # init_zaqar # start_zaqar @@ -194,6 +195,20 @@ function init_zaqar { # install_zaqar() - Collect source and prepare function install_zaqar { setup_develop $ZAQAR_DIR + + if is_service_enabled horizon; then + install_zaqarui + fi +} + +function install_zaqarui { + git_clone $ZAQARUI_REPO $ZAQARUI_DIR $ZAQARUI_BRANCH + setup_develop $ZAQARUI_DIR + 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) + fi } # install_zaqarclient() - Collect source and prepare diff --git a/devstack/settings b/devstack/settings index a7da058d5..5105f78f9 100644 --- a/devstack/settings +++ b/devstack/settings @@ -26,6 +26,10 @@ ZAQAR_BRANCH=${ZAQAR_BRANCH:-master} ZAQARCLIENT_REPO=${ZAQARCLIENT_REPO:-${GIT_BASE}/openstack/python-zaqarclient.git} ZAQARCLIENT_BRANCH=${ZAQARCLIENT_BRANCH:-master} +# Set Zaqar UI repository +ZAQARUI_REPO=${ZAQARUI_REPO:-${GIT_BASE}/openstack/zaqar-ui.git} +ZAQARUI_BRANCH=${ZAQARUI_BRANCH:-$ZAQAR_BRANCH} + # Set Zaqar Connection Info ZAQAR_SERVICE_HOST=${ZAQAR_SERVICE_HOST:-$SERVICE_HOST} ZAQAR_SERVICE_PORT=${ZAQAR_SERVICE_PORT:-8888}