Browse Source

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
Chris Johnson 3 years ago
parent
commit
9b20cef56b
1 changed files with 2 additions and 12 deletions
  1. 2
    12
      devstack/plugin.sh

+ 2
- 12
devstack/plugin.sh View File

@@ -250,18 +250,8 @@ function install_designateclient {
250 250
 function install_designatedashboard {
251 251
     git_clone $DESIGNATEDASHBOARD_REPO $DESIGNATEDASHBOARD_DIR $DESIGNATEDASHBOARD_BRANCH
252 252
     setup_develop $DESIGNATEDASHBOARD_DIR
253
-
254
-    # Just in case the old files are still here during trasition
255
-    if [ -f "$DESIGNATEDASHBOARD_DIR/designatedashboard/enabled/_70_dns_add_group.py" ]; then
256
-      ln -fs $DESIGNATEDASHBOARD_DIR/designatedashboard/enabled/_70_dns_add_group.py $HORIZON_DIR/openstack_dashboard/local/enabled/_1710_project_dns_panel_group.py
257
-    else
258
-      ln -fs $DESIGNATEDASHBOARD_DIR/designatedashboard/enabled/_1710_project_dns_panel_group.py $HORIZON_DIR/openstack_dashboard/local/enabled/_1710_project_dns_panel_group.py
259
-    fi
260
-    if [ -f "$DESIGNATEDASHBOARD_DIR/designatedashboard/enabled/_71_dns_project.py" ]; then
261
-      ln -fs $DESIGNATEDASHBOARD_DIR/designatedashboard/enabled/_71_dns_project.py $HORIZON_DIR/openstack_dashboard/local/enabled/_1720_project_dns_panel.py
262
-    else
263
-      ln -fs $DESIGNATEDASHBOARD_DIR/designatedashboard/enabled/_1720_project_dns_panel.py $HORIZON_DIR/openstack_dashboard/local/enabled/_1720_project_dns_panel.py
264
-    fi
253
+    ln -fs $DESIGNATEDASHBOARD_DIR/designatedashboard/enabled/_1710_project_dns_panel_group.py $HORIZON_DIR/openstack_dashboard/local/enabled/_1710_project_dns_panel_group.py
254
+    ln -fs $DESIGNATEDASHBOARD_DIR/designatedashboard/enabled/_1720_project_dns_panel.py $HORIZON_DIR/openstack_dashboard/local/enabled/_1720_project_dns_panel.py
265 255
 }
266 256
 
267 257
 # start_designate - Start running processes, including screen

Loading…
Cancel
Save