openstack/vitrage-dashboard
Code Issues Proposed changes

move panel files to local/enabled

Browse Source 
* use HORIZON_DIR env
* move VITRAGE_DASHBOARD_DIR to settings

Change-Id: Ic234a7054ffd5229a43cf46a4fbf9dd06e222672
This commit is contained in:
Eyal 2019-04-11 10:20:35 +03:00
parent 9659240157
commit 31ca5f00f3
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
devstack/plugin.sh
View File

@ -1,14 +1,13 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# plugin.sh - DevStack plugin.sh dispatch script vitrage-dashboard # plugin.sh - DevStack plugin.sh dispatch script vitrage-dashboard
VITRAGE_DASHBOARD_DIR=$(cd $(dirname $BASH_SOURCE)/.. && pwd)
function install_vitrage_dashboard { function install_vitrage_dashboard {
setup_develop ${VITRAGE_DASHBOARD_DIR} setup_develop ${VITRAGE_DASHBOARD_DIR}
} }
function configure_vitrage_dashboard { function configure_vitrage_dashboard {
cp -a ${VITRAGE_DASHBOARD_DIR}/vitrage_dashboard/enabled/* ${DEST}/horizon/openstack_dashboard/enabled/ cp -a ${VITRAGE_DASHBOARD_DIR}/vitrage_dashboard/enabled/* ${HORIZON_DIR}/openstack_dashboard/local/enabled/
} }
function init_vitrage_dashboard { function init_vitrage_dashboard {
@ -48,9 +47,11 @@ if is_service_enabled vitrage-dashboard; then
fi fi
if [[ "$1" == "clean" ]]; then if [[ "$1" == "clean" ]]; then
# Remove state and transient data rm -f ${HORIZON_DIR}/openstack_dashboard/local/enabled/_40*
# Remember clean.sh first calls unstack.sh rm -f ${HORIZON_DIR}/openstack_dashboard/local/enabled/_41*
# no-op
: # for backward computability
rm -f ${HORIZON_DIR}/openstack_dashboard/enabled/_40*
rm -f ${HORIZON_DIR}/openstack_dashboard/enabled/_41*
fi fi
fi fi

2
devstack/settings
View File

@ -1,2 +1,4 @@
# settings file for vitrage-dashboard plugin # settings file for vitrage-dashboard plugin
enable_service vitrage-dashboard enable_service vitrage-dashboard
VITRAGE_DASHBOARD_DIR=$DEST/vitrage-dashboard