Browse Source

Fix df-ext-services.sh run under devstack

Commit 4218506367 includes
devstack neutron scripts which triggers a dependency issue
happens in df-ext-services.sh.

df-ext-services.sh which doesn't run under devstack directory cannot
locate $TOP_DIR which points to devstack directory in plugin.sh.

In this patch, we dynamically locates and updates $TOP_DIR
in df-ext-services.sh.

Change-Id: I816f8157b4c1520707f6d8664b9390a9e3fed6fb
Closes-Bug: #1525499
tags/1.0.0
Li Ma 3 years ago
parent
commit
5d1f898243
2 changed files with 6 additions and 0 deletions
  1. 3
    0
      devstack/df-ext-services.sh
  2. 3
    0
      devstack/plugin.sh

+ 3
- 0
devstack/df-ext-services.sh View File

@@ -1,5 +1,8 @@
1 1
 #!/usr/bin/env bash
2 2
 
3
+# Locate devstack directory
4
+TOP_DIR=
5
+
3 6
 # Detect path for this script file
4 7
 DF_DIR=$(cd $(dirname "$0") && pwd)
5 8
 

+ 3
- 0
devstack/plugin.sh View File

@@ -128,6 +128,9 @@ function init_ovs {
128 128
 
129 129
 function install_df {
130 130
 
131
+    # Obtain devstack directory for df-ext-services.sh
132
+    sed -i "/^TOP_DIR=/cTOP_DIR=$TOP_DIR" $DEST/dragonflow/devstack/df-ext-services.sh
133
+
131 134
     nb_db_driver_install_server
132 135
 
133 136
     nb_db_driver_install_client

Loading…
Cancel
Save