Browse code

Merge "Default to linuxbridge and openvswitch drivers for ML2."

Jenkins authored on 2013/09/11 00:36:41
Showing 1 changed files
... ...
@@ -20,7 +20,7 @@ Q_AGENT=${Q_AGENT:-openvswitch}
20 20
 source $TOP_DIR/lib/neutron_plugins/${Q_AGENT}_agent
21 21
 
22 22
 # List of MechanismDrivers to load
23
-Q_ML2_PLUGIN_MECHANISM_DRIVERS=${Q_ML2_PLUGIN_MECHANISM_DRIVERS:-}
23
+Q_ML2_PLUGIN_MECHANISM_DRIVERS=${Q_ML2_PLUGIN_MECHANISM_DRIVERS:-openvswitch,linuxbridge}
24 24
 # List of Type Drivers to load
25 25
 Q_ML2_PLUGIN_TYPE_DRIVERS=${Q_ML2_PLUGIN_TYPE_DRIVERS:-local,flat,vlan,gre,vxlan}
26 26
 # Default GRE TypeDriver options