From 9b20cef56bef40eba2e18a4b92a953113e19d273 Mon Sep 17 00:00:00 2001 From: Chris Johnson Date: Mon, 22 Feb 2016 16:36:19 -0500 Subject: [PATCH] Cleanup after enable files refactor Reecently, while the "enabled" files were refactored from a 2 digit to 4 digit numbering scheme, we had to introduce some logic to handle both the old and new numbering to ensure the change made it through the gates. Now that that change has successfully been committed, this change cleans up that excess logic. Change-Id: Ie7769a52f944fdceabdf9cec64c678425d341129 --- devstack/plugin.sh | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 1b629427c..412031bc3 100755 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -250,18 +250,8 @@ function install_designateclient { function install_designatedashboard { git_clone $DESIGNATEDASHBOARD_REPO $DESIGNATEDASHBOARD_DIR $DESIGNATEDASHBOARD_BRANCH setup_develop $DESIGNATEDASHBOARD_DIR - - # Just in case the old files are still here during trasition - if [ -f "$DESIGNATEDASHBOARD_DIR/designatedashboard/enabled/_70_dns_add_group.py" ]; then - ln -fs $DESIGNATEDASHBOARD_DIR/designatedashboard/enabled/_70_dns_add_group.py $HORIZON_DIR/openstack_dashboard/local/enabled/_1710_project_dns_panel_group.py - else - ln -fs $DESIGNATEDASHBOARD_DIR/designatedashboard/enabled/_1710_project_dns_panel_group.py $HORIZON_DIR/openstack_dashboard/local/enabled/_1710_project_dns_panel_group.py - fi - if [ -f "$DESIGNATEDASHBOARD_DIR/designatedashboard/enabled/_71_dns_project.py" ]; then - ln -fs $DESIGNATEDASHBOARD_DIR/designatedashboard/enabled/_71_dns_project.py $HORIZON_DIR/openstack_dashboard/local/enabled/_1720_project_dns_panel.py - else - ln -fs $DESIGNATEDASHBOARD_DIR/designatedashboard/enabled/_1720_project_dns_panel.py $HORIZON_DIR/openstack_dashboard/local/enabled/_1720_project_dns_panel.py - fi + ln -fs $DESIGNATEDASHBOARD_DIR/designatedashboard/enabled/_1710_project_dns_panel_group.py $HORIZON_DIR/openstack_dashboard/local/enabled/_1710_project_dns_panel_group.py + ln -fs $DESIGNATEDASHBOARD_DIR/designatedashboard/enabled/_1720_project_dns_panel.py $HORIZON_DIR/openstack_dashboard/local/enabled/_1720_project_dns_panel.py } # start_designate - Start running processes, including screen