openstack/sahara-dashboard
Code Issues Proposed changes

Merge "Update devstack plugin"

Browse Source
This commit is contained in:
Jenkins 2016-02-04 16:01:52 +00:00 committed by Gerrit Code Review
commit 0d1e79b10f
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
devstack/plugin.sh
View File

@ -3,11 +3,11 @@
SAHARA_DASH_DIR=$(cd $(dirname $BASH_SOURCE)/.. && pwd) SAHARA_DASH_DIR=$(cd $(dirname $BASH_SOURCE)/.. && pwd)
function install_sahara_dashboard { function install_sahara_dashboard {
sudo pip install --upgrade ${SAHARA_DASH_DIR} setup_develop --upgrade ${SAHARA_DASH_DIR}
}
cp -a ${SAHARA_DASH_DIR}/sahara_dashboard/enabled/* ${DEST}/horizon/openstack_dashboard/enabled/ function configure_sahara_dashboard {
python ${DEST}/horizon/manage.py collectstatic --noinput cp -a ${SAHARA_DASH_DIR}/sahara_dashboard/enabled/* ${DEST}/horizon/openstack_dashboard/local/enabled/
python ${DEST}/horizon/manage.py compress --force
} }
# check for service enabled # check for service enabled
@ -20,13 +20,13 @@ if is_service_enabled sahara-dashboard; then
elif [[ "$1" == "stack" && "$2" == "install" ]]; then elif [[ "$1" == "stack" && "$2" == "install" ]]; then
# Perform installation of service source # Perform installation of service source
# no-op echo_summary "Installing Sahara Dashboard"
: install_sahara_dashboard
elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then
# Configure after the other layer 1 and 2 services have been configured # Configure after the other layer 1 and 2 services have been configured
echo_summary "Installing Sahara Dashboard" echo_summary "Configuring Sahara Dashboard"
install_sahara_dashboard configure_sahara_dashboard
elif [[ "$1" == "stack" && "$2" == "extra" ]]; then elif [[ "$1" == "stack" && "$2" == "extra" ]]; then
# Initialize and start the app-catalog-ui service # Initialize and start the app-catalog-ui service