From 0d25bbd63b2392f07e1f37e3d94119883858d3dd Mon Sep 17 00:00:00 2001 From: Elena Ezhova Date: Tue, 5 Jul 2016 15:41:29 +0300 Subject: [PATCH] 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 --- devstack/plugin.sh | 4 ++-- devstack/settings | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 75be2df..51ff233 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -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 diff --git a/devstack/settings b/devstack/settings index d61a8c4..7f94820 100644 --- a/devstack/settings +++ b/devstack/settings @@ -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