openstack
/
octavia-dashboard
Code Issues Proposed changes

Fix devstack plugin clean-up 

Currently calling clean.sh leads to NEUTRON_LBAAS_DASHBOARD_ENABLE_FILE
being deleted. The problem is that this variable contains path to a
file in neutron-lbaas-dashboard directory, not its copy in Horizon
directory. This patch fixes this by deleting proper files.

Change-Id: I9fcb96e4a0928a2b6a9da3e70dbb0e185dff7108
This commit is contained in:
Elena Ezhova 2016-07-05 15:41:29 +03:00
parent 0fd6939111
commit 0d25bbd63b
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devstack/plugin.sh
View File

@ -3,7 +3,7 @@ function neutron_lbaas_dashboard_install {
}
function neutron_lbaas_dashboard_configure {
cp $NEUTRON_LBAAS_DASHBOARD_ENABLE_FILE \
cp $NEUTRON_LBAAS_DASHBOARD_ENABLE_FILE_PATH \
$HORIZON_DIR/openstack_dashboard/local/enabled/
}
@ -31,5 +31,5 @@ if [[ "$1" == "clean" ]]; then
# Remember clean.sh first calls unstack.sh
# Remove lbaas-dashboard enabled file and pyc
rm -f ${NEUTRON_LBAAS_DASHBOARD_ENABLE_FILE}*
rm -f "$HORIZON_DIR"/openstack_dashboard/local/enabled/"$NEUTRON_LBAAS_DASHBOARD_ENABLE_FILE_NAME"*
fi

4
devstack/settings
View File

@ -1,3 +1,5 @@
NEUTRON_LBAAS_DASHBOARD_DIR=$DEST/neutron-lbaas-dashboard
NEUTRON_LBAAS_DASHBOARD_ENABLE_FILE=$NEUTRON_LBAAS_DASHBOARD_DIR/neutron_lbaas_dashboard/enabled/_1481_project_ng_loadbalancersv2_panel.py
NEUTRON_LBAAS_DASHBOARD_ENABLE_FILE_NAME=_1481_project_ng_loadbalancersv2_panel.py
NEUTRON_LBAAS_DASHBOARD_ENABLE_FILE_PATH=$NEUTRON_LBAAS_DASHBOARD_DIR/neutron_lbaas_dashboard/enabled/$NEUTRON_LBAAS_DASHBOARD_ENABLE_FILE_NAME