Skip to content

Commit 22cf648

Browse files
author
Hirofumi Ichihara
committed
Remove restraint on agent file from ml2 plugin
Ml2 plugin always needs agent file even if the agent is out of tree. This patch removes the restraint and ofagent_agent. Change-Id: I12de58e13da1fd162ad8b632d895779ae7560c3c Closes-Bug: #1477459
1 parent c305120 commit 22cf648

2 files changed

Lines changed: 3 additions & 5 deletions

File tree

lib/neutron_plugins/ml2

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@ fi
1919

2020
# Default openvswitch L2 agent
2121
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
2325

2426
# List of MechanismDrivers to load
2527
Q_ML2_PLUGIN_MECHANISM_DRIVERS=${Q_ML2_PLUGIN_MECHANISM_DRIVERS:-openvswitch,linuxbridge}

lib/neutron_plugins/ofagent_agent

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)