Browse Source

Update devstack dashboard+client clone+install method

This updates our devstack plugin to use the current clone+install
method for the client (missing vars) and dashboard (replaced with
the new method).

Designate itself is still using old vars, but I suspect this is
a leftover and there's really no need for Designate to try
clone itself since the plugin is inline now...

Change-Id: I2189abc196d74520fa3fae0da215a1c6dd891387
Kiall Mac Innes 2 years ago
parent
commit
b4cd2c8042
2 changed files with 10 additions and 4 deletions
  1. 3
    2
      devstack/plugin.sh
  2. 7
    2
      devstack/settings

+ 3
- 2
devstack/plugin.sh View File

@@ -264,8 +264,9 @@ function install_designateclient {
264 264
 
265 265
 # install_designatedashboard - Collect source and prepare
266 266
 function install_designatedashboard {
267
-    git_clone $DESIGNATEDASHBOARD_REPO $DESIGNATEDASHBOARD_DIR $DESIGNATEDASHBOARD_BRANCH
268
-    setup_develop $DESIGNATEDASHBOARD_DIR
267
+    git_clone_by_name "designate-dashboard"
268
+    setup_dev_lib "designate-dashboard"
269
+
269 270
     ln -fs $DESIGNATEDASHBOARD_DIR/designatedashboard/enabled/_1710_project_dns_panel_group.py $HORIZON_DIR/openstack_dashboard/local/enabled/_1710_project_dns_panel_group.py
270 271
     ln -fs $DESIGNATEDASHBOARD_DIR/designatedashboard/enabled/_1720_project_dns_panel.py $HORIZON_DIR/openstack_dashboard/local/enabled/_1720_project_dns_panel.py
271 272
 }

+ 7
- 2
devstack/settings View File

@@ -43,8 +43,13 @@ DESIGNATE_PLUGINS=$DESIGNATE_DIR/devstack/designate_plugins
43 43
 # Default repositories
44 44
 DESIGNATE_REPO=${DESIGNATE_REPO:-${GIT_BASE}/openstack/designate.git}
45 45
 DESIGNATE_BRANCH=${DESIGNATE_BRANCH:-master}
46
-DESIGNATEDASHBOARD_REPO=${DESIGNATEDASHBOARD_REPO:-${GIT_BASE}/openstack/designate-dashboard.git}
47
-DESIGNATEDASHBOARD_BRANCH=${DESIGNATEDASHBOARD_BRANCH:-master}
46
+
47
+GITREPO["designate-dashboard"]=${DESIGNATEDASHBOARD_REPO:-${GIT_BASE}/openstack/designate-dashboard.git}
48
+GITBRANCH["designate-dashboard"]=${DESIGNATEDASHBOARD_BRANCH:-master}
49
+GITDIR["designate-dashboard"]=$DEST/designate-dashboard
50
+
51
+GITREPO["python-designateclient"]=${DESIGNATECLIENT_REPO:-${GIT_BASE}/openstack/python-designateclient.git}
52
+GITBRANCH["python-designateclient"]=${DESIGNATECLIENT_BRANCH:-master}
48 53
 GITDIR["python-designateclient"]=$DEST/python-designateclient
49 54
 
50 55
 GITREPO["designate-tempest-plugin"]=${DESIGNATETEMPEST_REPO:-${GIT_BASE}/openstack/designate-tempest-plugin.git}

Loading…
Cancel
Save