openstack
/
blazar
Code Issues Proposed changes

Merge "Support blazar-dashboard installation in DevStack"

This commit is contained in:
Zuul 2018-07-10 11:06:35 +00:00 committed by Gerrit Code Review
parent 0c65190306 6b7b59f9ce
commit 455c209279
2 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
devstack/plugin.sh
View File

@ -185,6 +185,27 @@ function install_blazar {
}
# install_blazar_dashboard() - Install Blazar dashboard for Horizon
function install_blazar_dashboard {
git_clone $BLAZAR_DASHBOARD_REPO $BLAZAR_DASHBOARD_DIR $BLAZAR_DASHBOARD_BRANCH
setup_develop $BLAZAR_DASHBOARD_DIR
blazar_setup_horizon
}
# Set up Horizon integration with Blazar
function blazar_setup_horizon {
# Link Dashboard panel to Horizon's directory
ln -fs $BLAZAR_DASHBOARD_DIR/blazar_dashboard/enabled/_90_admin_reservation_panelgroup.py $HORIZON_DIR/openstack_dashboard/local/enabled/
ln -fs $BLAZAR_DASHBOARD_DIR/blazar_dashboard/enabled/_90_project_reservations_panelgroup.py $HORIZON_DIR/openstack_dashboard/local/enabled/
ln -fs $BLAZAR_DASHBOARD_DIR/blazar_dashboard/enabled/_91_admin_reservation_hosts_panel.py $HORIZON_DIR/openstack_dashboard/local/enabled/
ln -fs $BLAZAR_DASHBOARD_DIR/blazar_dashboard/enabled/_91_project_reservations_leases_panel.py $HORIZON_DIR/openstack_dashboard/local/enabled/
# Restart Horizon
restart_apache_server
}
# start_blazar() - Start running processes, including screen
function start_blazar {
if [ "$BLAZAR_USE_MOD_WSGI" == "True" ]; then
@ -220,6 +241,11 @@ if is_service_enabled blazar blazar-m blazar-a; then
echo_summary "Installing Blazar"
# Use stack_install_service here to account for virtualenv
stack_install_service blazar
if is_service_enabled horizon; then
install_blazar_dashboard
fi
elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then
echo_summary "Configuring Blazar"
configure_blazar

3
devstack/settings
View File

@ -17,6 +17,8 @@ BLAZARCLIENT_REPO=${BLAZARCLIENT_REPO:-${GIT_BASE}/openstack/python-blazarclient
BLAZARCLIENT_BRANCH=${BLAZARCLIENT_BRANCH:-master}
BLAZARNOVA_REPO=${BLAZARNOVA_REPO:-${GIT_BASE}/openstack/blazar-nova.git}
BLAZARNOVA_BRANCH=${BLAZARNOVA_BRANCH:-master}
BLAZAR_DASHBOARD_REPO=${BLAZAR_DASHBOARD_REPO:-${GIT_BASE}/openstack/blazar-dashboard.git}
BLAZAR_DASHBOARD_BRANCH=${BLAZAR_DASHBOARD_BRANCH:-master}
# Set up default directories
BLAZAR_DIR=$DEST/blazar
@ -25,6 +27,7 @@ BLAZAR_CONF_FILE=$BLAZAR_CONF_DIR/blazar.conf
BLAZARCLIENT_DIR=$DEST/python-blazarclient
BLAZAR_AUTH_CACHE_DIR=${BLAZAR_AUTH_CACHE_DIR:-/var/cache/blazar}
BLAZARNOVA_DIR=$DEST/blazar-nova
BLAZAR_DASHBOARD_DIR=$DEST/blazar-dashboard
# wsgi deployment
BLAZAR_USE_MOD_WSGI=${BLAZAR_USE_MOD_WSGI:-True}