From: Assaf Muller <amuller@redhat.com>
Date: Tue, 17 Dec 2013 15:05:15 +0000 (+0200)
Subject: Add VXLAN example to ovs_neutron_plugin.ini
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=381e05f0d705bb71d4d2b8cd61eb9a720d0ede75;p=openstack-build%2Fneutron-build.git

Add VXLAN example to ovs_neutron_plugin.ini

Change-Id: I512bc206f051b58ed346e1fc5247d692ba9bdba3
---

diff --git a/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini b/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini
index ba5791dc1..146b2cf97 100644
--- a/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini
+++ b/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini
@@ -144,10 +144,22 @@
 # integration_bridge = br-int
 # bridge_mappings = default:br-eth1
 #
-# 2. With tunneling.
+# 2. With GRE tunneling.
 # [OVS]
 # network_vlan_ranges =
 # tunnel_id_ranges = 1:1000
 # integration_bridge = br-int
 # tunnel_bridge = br-tun
 # local_ip = 10.0.0.3
+#
+# 3. With VXLAN tunneling.
+# [OVS]
+# network_vlan_ranges =
+# tenant_network_type = vxlan
+# tunnel_type = vxlan
+# tunnel_id_ranges = 1:1000
+# integration_bridge = br-int
+# tunnel_bridge = br-tun
+# local_ip = 10.0.0.3
+# [AGENT]
+# tunnel_types = vxlan