openstack/zaqar
Code Issues Proposed changes

Enanble Zaqar-UI in devstack

Browse Source 
Change-Id: Ibc783bb6f0c86528ec49cb9abedc247b49580858
This commit is contained in:
Fei Long Wang 2016-10-08 19:24:00 +13:00
parent 69df4317d9
commit 9d9147a189
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
devstack/plugin.sh
View File

@ -17,6 +17,7 @@
# stack.sh # stack.sh
# --------- # ---------
# install_zaqar # install_zaqar
# install_zaqarui
# configure_zaqar # configure_zaqar
# init_zaqar # init_zaqar
# start_zaqar # start_zaqar
@ -194,6 +195,20 @@ function init_zaqar {
# install_zaqar() - Collect source and prepare # install_zaqar() - Collect source and prepare
function install_zaqar { function install_zaqar {
setup_develop $ZAQAR_DIR 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 # install_zaqarclient() - Collect source and prepare

4
devstack/settings
View File

@ -26,6 +26,10 @@ ZAQAR_BRANCH=${ZAQAR_BRANCH:-master}
ZAQARCLIENT_REPO=${ZAQARCLIENT_REPO:-${GIT_BASE}/openstack/python-zaqarclient.git} ZAQARCLIENT_REPO=${ZAQARCLIENT_REPO:-${GIT_BASE}/openstack/python-zaqarclient.git}
ZAQARCLIENT_BRANCH=${ZAQARCLIENT_BRANCH:-master} 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 # Set Zaqar Connection Info
ZAQAR_SERVICE_HOST=${ZAQAR_SERVICE_HOST:-$SERVICE_HOST} ZAQAR_SERVICE_HOST=${ZAQAR_SERVICE_HOST:-$SERVICE_HOST}
ZAQAR_SERVICE_PORT=${ZAQAR_SERVICE_PORT:-8888} ZAQAR_SERVICE_PORT=${ZAQAR_SERVICE_PORT:-8888}