Browse code

Merge "Remove restraint on agent file from ml2 plugin"

Jenkins authored on 2015/09/02 03:21:07
Showing 2 changed files
... ...
@@ -19,7 +19,9 @@ fi
19 19
 
20 20
 # Default openvswitch L2 agent
21 21
 Q_AGENT=${Q_AGENT:-openvswitch}
22
-source $TOP_DIR/lib/neutron_plugins/${Q_AGENT}_agent
22
+if [ -f $TOP_DIR/lib/neutron_plugins/${Q_AGENT}_agent ]; then
23
+    source $TOP_DIR/lib/neutron_plugins/${Q_AGENT}_agent
24
+fi
23 25
 
24 26
 # List of MechanismDrivers to load
25 27
 Q_ML2_PLUGIN_MECHANISM_DRIVERS=${Q_ML2_PLUGIN_MECHANISM_DRIVERS:-openvswitch,linuxbridge}
26 28
deleted file mode 100644
... ...
@@ -1,4 +0,0 @@
1
-#!/bin/bash
2
-
3
-# REVISIT(yamamoto): This file is intentionally left empty
4
-# in order to keep Q_AGENT=ofagent_agent work.