openstack/devstack
Code Issues Proposed changes

Merge "Remove restraint on agent file from ml2 plugin"

Browse Source
This commit is contained in:
Jenkins 2015-09-01 18:21:07 +00:00 committed by Gerrit Code Review
commit 20a854c6d2
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
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}
if [ -f $TOP_DIR/lib/neutron_plugins/${Q_AGENT}_agent ]; then
source $TOP_DIR/lib/neutron_plugins/${Q_AGENT}_agent 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.