openstack/devstack
Code Issues Proposed changes

Remove restraint on agent file from ml2 plugin

Browse Source 
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
This commit is contained in:
Hirofumi Ichihara 2015-07-23 18:13:55 +09:00
parent c305120f48
commit 22cf648cf6
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/neutron_plugins/ml2
View File

@ -19,7 +19,9 @@ fi
# Default openvswitch L2 agent # Default openvswitch L2 agent
Q_AGENT=${Q_AGENT:-openvswitch} Q_AGENT=${Q_AGENT:-openvswitch}
source $TOP_DIR/lib/neutron_plugins/${Q_AGENT}_agent if [ -f $TOP_DIR/lib/neutron_plugins/${Q_AGENT}_agent ]; then
source $TOP_DIR/lib/neutron_plugins/${Q_AGENT}_agent
fi
# List of MechanismDrivers to load # List of MechanismDrivers to load
Q_ML2_PLUGIN_MECHANISM_DRIVERS=${Q_ML2_PLUGIN_MECHANISM_DRIVERS:-openvswitch,linuxbridge} Q_ML2_PLUGIN_MECHANISM_DRIVERS=${Q_ML2_PLUGIN_MECHANISM_DRIVERS:-openvswitch,linuxbridge}

4
lib/neutron_plugins/ofagent_agent
View File

@ -1,4 +0,0 @@
#!/bin/bash
# REVISIT(yamamoto): This file is intentionally left empty
# in order to keep Q_AGENT=ofagent_agent work.