Browse Source

devstack: Always install networking-dpm

We only installed networking-dpm when the q-dpm-agt service is enabled.
This is important for scenarios, where somebody wants to have networking-dpm
installed, but not the q-dpm-agt.

Change-Id: I8620ff1f4a5b79d63305e891fb9b12e3b3c30f55
Andreas Scheuring 1 year ago
parent
commit
6efa84227d
1 changed files with 5 additions and 4 deletions
  1. 5
    4
      devstack/plugin.sh

+ 5
- 4
devstack/plugin.sh View File

@@ -21,6 +21,9 @@ DPM_AGENT_CONF="etc/neutron/plugins/ml2/neutron_dpm_agent.conf"
21 21
 #DPM_AGENT_CONF="${Q_PLUGIN_CONF_PATH}/dpm_agent.ini"
22 22
 DPM_AGENT_BINARY="${NEUTRON_BIN_DIR}/neutron-dpm-agent"
23 23
 
24
+# Install networking dpm
25
+setup_develop $NETWORKING_DPM_DIR
26
+
24 27
 # check for service enabled
25 28
 if is_service_enabled q-dpm-agt; then
26 29
 
@@ -30,9 +33,7 @@ if is_service_enabled q-dpm-agt; then
30 33
         :
31 34
 
32 35
     elif [[ "$1" == "stack" && "$2" == "install" ]]; then
33
-        # Perform installation of service source
34
-        setup_develop $NETWORKING_DPM_DIR
35
-
36
+        :
36 37
 
37 38
     elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then
38 39
         # Configure after the other layer 1 and 2 services have been configured
@@ -63,4 +64,4 @@ if is_service_enabled q-dpm-agt; then
63 64
 fi
64 65
 
65 66
 # Restore xtrace
66
-$XTRACE
67
+$XTRACE

Loading…
Cancel
Save