x/vmware-nsx
Code Issues Proposed changes

Merge "Improve ml2_conf.ini"

Browse Source
This commit is contained in:
Jenkins 2013-09-30 14:41:14 +00:00 committed by Gerrit Code Review
commit c69cd81441
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
etc/neutron/plugins/ml2/ml2_conf.ini
View File

@ -12,13 +12,6 @@
# tenant_network_types = local # tenant_network_types = local
# Example: tenant_network_types = vlan,gre,vxlan # Example: tenant_network_types = vlan,gre,vxlan
# (StrOpt) Multicast group for the VXLAN interface. When configured, will
# enable sending all broadcast traffic to this multicast group. When left
# unconfigured, will disable multicast VXLAN mode.
#
# vxlan_group =
# Example: vxlan_group = 239.1.1.1
# (ListOpt) Ordered list of networking mechanism driver entrypoints # (ListOpt) Ordered list of networking mechanism driver entrypoints
# to be loaded from the neutron.ml2.mechanism_drivers namespace. # to be loaded from the neutron.ml2.mechanism_drivers namespace.
# mechanism_drivers = # mechanism_drivers =
@ -46,3 +39,16 @@
[ml2_type_gre] [ml2_type_gre]
# (ListOpt) Comma-separated list of <tun_min>:<tun_max> tuples enumerating ranges of GRE tunnel IDs that are available for tenant network allocation # (ListOpt) Comma-separated list of <tun_min>:<tun_max> tuples enumerating ranges of GRE tunnel IDs that are available for tenant network allocation
# tunnel_id_ranges = # tunnel_id_ranges =
[ml2_type_vxlan]
# (ListOpt) Comma-separated list of <vni_min>:<vni_max> tuples enumerating
# ranges of VXLAN VNI IDs that are available for tenant network allocation.
#
# vni_ranges =
# (StrOpt) Multicast group for the VXLAN interface. When configured, will
# enable sending all broadcast traffic to this multicast group. When left
# unconfigured, will disable multicast VXLAN mode.
#
# vxlan_group =
# Example: vxlan_group = 239.1.1.1