From 8152a1586292cd4d52d1462f6b0ef48b5077b93c Mon Sep 17 00:00:00 2001
From: "Kyle L. Henderson" <kyleh@us.ibm.com>
Date: Mon, 13 Mar 2017 11:05:29 -0500
Subject: [PATCH] Provide example of using veth pairs for br-vlan

When the neutron agent is not containerized on compute
hosts a veth pair is needed to provide a non-bridge interface
in order to access br-vlan for tenant vlans.

Related-Bug: 1656344
Related-Bug: 1399432

Change-Id: Id1ee07a1d0720b35c908221fc560c188f3444c64
---
 .../openstack_interface.cfg.prod.example      | 25 ++++++++++++++++++
 .../openstack_interface.cfg.test.example      | 26 +++++++++++++++----
 2 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/etc/network/interfaces.d/openstack_interface.cfg.prod.example b/etc/network/interfaces.d/openstack_interface.cfg.prod.example
index 7a23646d77..b95159962d 100644
--- a/etc/network/interfaces.d/openstack_interface.cfg.prod.example
+++ b/etc/network/interfaces.d/openstack_interface.cfg.prod.example
@@ -107,6 +107,31 @@ iface br-vlan inet manual
     bridge_fd 0
     bridge_ports bond1
 
+# compute1 Network VLAN bridge
+#auto br-vlan
+#iface br-vlan inet manual
+#    bridge_stp off
+#    bridge_waitport 0
+#    bridge_fd 0
+#
+# For tenant vlan support, create a veth pair to be used when the neutron
+# agent is not containerized on the compute hosts. 'eth12' is the value used on
+# the host_bind_override parameter of the br-vlan network section of the
+# openstack_user_config example file. The veth peer name must match the value
+# specified on the host_bind_override parameter.
+#
+# When the neutron agent is containerized it will use the container_interface
+# value of the br-vlan network, which is also the same 'eth12' value.
+#
+# Create veth pair, do not abort if already exists
+#    pre-up ip link add br-vlan-veth type veth peer name eth12 || true
+# Set both ends UP
+#    pre-up ip link set br-vlan-veth up
+#    pre-up ip link set eth12 up
+# Delete veth pair on DOWN
+#    post-down ip link del br-vlan-veth || true
+#    bridge_ports bond1 br-vlan-veth
+
 # Storage bridge (optional)
 #
 # Only the COMPUTE and STORAGE nodes must have an IP address
diff --git a/etc/network/interfaces.d/openstack_interface.cfg.test.example b/etc/network/interfaces.d/openstack_interface.cfg.test.example
index d423653f72..e31faa6ca1 100644
--- a/etc/network/interfaces.d/openstack_interface.cfg.test.example
+++ b/etc/network/interfaces.d/openstack_interface.cfg.test.example
@@ -69,14 +69,30 @@ iface br-vlan inet manual
     bridge_fd 0
     bridge_ports eth0
 
+# compute1 Network VLAN bridge
+#auto br-vlan
+#iface br-vlan inet manual
+#    bridge_stp off
+#    bridge_waitport 0
+#    bridge_fd 0
+#
+# For tenant vlan support, create a veth pair to be used when the neutron
+# agent is not containerized on the compute hosts. 'eth12' is the value used on
+# the host_bind_override parameter of the br-vlan network section of the
+# openstack_user_config example file. The veth peer name must match the value
+# specified on the host_bind_override parameter.
+#
+# When the neutron agent is containerized it will use the container_interface
+# value of the br-vlan network, which is also the same 'eth12' value.
+#
 # Create veth pair, do not abort if already exists
-    pre-up ip link add br-vlan-veth type veth peer name eth0 || true
+#    pre-up ip link add br-vlan-veth type veth peer name eth12 || true
 # Set both ends UP
-    pre-up ip link set br-vlan-veth up
-    pre-up ip link set eth0 up
+#    pre-up ip link set br-vlan-veth up
+#    pre-up ip link set eth12 up
 # Delete veth pair on DOWN
-    post-down ip link del br-vlan-veth || true
-    bridge_ports br-vlan-veth
+#    post-down ip link del br-vlan-veth || true
+#    bridge_ports eth0 br-vlan-veth
 
 # Storage bridge (optional)
 #