Browse code

Merge "README.md: Correct the defaults of some of Q_ML2_PLUGIN variables"

Jenkins authored on 2015/03/12 04:17:53
Showing 1 changed files
... ...
@@ -249,14 +249,17 @@ To change this, set the `Q_AGENT` variable to the agent you want to run
249 249
     Variable Name                    Notes
250 250
     ----------------------------------------------------------------------------
251 251
     Q_AGENT                          This specifies which agent to run with the
252
-                                     ML2 Plugin (either `openvswitch` or `linuxbridge`).
252
+                                     ML2 Plugin (Typically either `openvswitch`
253
+                                     or `linuxbridge`).
254
+                                     Defaults to `openvswitch`.
253 255
     Q_ML2_PLUGIN_MECHANISM_DRIVERS   The ML2 MechanismDrivers to load. The default
254
-                                     is none. Note, ML2 will work with the OVS
255
-                                     and LinuxBridge agents by default.
256
+                                     is `openvswitch,linuxbridge`.
256 257
     Q_ML2_PLUGIN_TYPE_DRIVERS        The ML2 TypeDrivers to load. Defaults to
257 258
                                      all available TypeDrivers.
258
-    Q_ML2_PLUGIN_GRE_TYPE_OPTIONS    GRE TypeDriver options. Defaults to none.
259
-    Q_ML2_PLUGIN_VXLAN_TYPE_OPTIONS  VXLAN TypeDriver options. Defaults to none.
259
+    Q_ML2_PLUGIN_GRE_TYPE_OPTIONS    GRE TypeDriver options. Defaults to
260
+                                     `tunnel_id_ranges=1:1000'.
261
+    Q_ML2_PLUGIN_VXLAN_TYPE_OPTIONS  VXLAN TypeDriver options. Defaults to
262
+                                     `vni_ranges=1001:2000`
260 263
     Q_ML2_PLUGIN_VLAN_TYPE_OPTIONS   VLAN TypeDriver options. Defaults to none.
261 264
 
262 265
 # Heat