From f157b9c8251616fd18757cfa9a45a04ee1e2deb1 Mon Sep 17 00:00:00 2001 From: ZhiQiang Fan Date: Mon, 30 Sep 2013 01:11:43 +0800 Subject: [PATCH] Improve ml2_conf.ini ml2_type_vxlan section is missing, also does option vni_ranges. Change-Id: Icf9328d82603640279d1c5aa31f41b6ff23c26f0 Fixes-Bug: #1231124 --- etc/neutron/plugins/ml2/ml2_conf.ini | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/etc/neutron/plugins/ml2/ml2_conf.ini b/etc/neutron/plugins/ml2/ml2_conf.ini index ba8e1dd5895..a9b0d508b67 100644 --- a/etc/neutron/plugins/ml2/ml2_conf.ini +++ b/etc/neutron/plugins/ml2/ml2_conf.ini @@ -12,13 +12,6 @@ # tenant_network_types = local # 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 # to be loaded from the neutron.ml2.mechanism_drivers namespace. # mechanism_drivers = @@ -46,3 +39,16 @@ [ml2_type_gre] # (ListOpt) Comma-separated list of : tuples enumerating ranges of GRE tunnel IDs that are available for tenant network allocation # tunnel_id_ranges = + +[ml2_type_vxlan] +# (ListOpt) Comma-separated list of : 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