From: Harry Huang <huangxiangyu5@huawei.com>
Date: Mon, 16 Jul 2018 09:26:35 +0000 (+0800)
Subject: Add external veth pair
X-Git-Tag: opnfv-7.0.0~40
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F51%2F59851%2F1;p=compass4nfv.git

Add external veth pair

JIRA: COMPASS-604

Add veth pair and connect them to br-external.
OpenDaylight can bind that veth instead of the
external interface.

Change-Id: I26f122bf8cab0943b7b056050de01381bab6d395
Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>
---

diff --git a/deploy/adapters/ansible/roles/config-compute/templates/compute.j2 b/deploy/adapters/ansible/roles/config-compute/templates/compute.j2
index b23550f9..60cb12ac 100644
--- a/deploy/adapters/ansible/roles/config-compute/templates/compute.j2
+++ b/deploy/adapters/ansible/roles/config-compute/templates/compute.j2
@@ -64,13 +64,13 @@ iface br-external inet static
     gateway {{ ip_settings[inventory_hostname]["external"]["gw"] }}
     offload-sg off
     # Create veth pair, don't bomb if already exists
-    pre-up ip link add br-vlan-veth type veth peer name eth12 || true
+    pre-up ip link add br-external-veth type veth peer name external-nic || true
     # Set both ends UP
-    pre-up ip link set br-vlan-veth up
-    pre-up ip link set eth12 up
+    pre-up ip link set br-external-veth up
+    pre-up ip link set external-nic 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-external-veth || true
+    bridge_ports br-external-veth
 
 # VXLAN (tunnel/overlay) bridge config
 auto br-tenant
diff --git a/deploy/adapters/ansible/roles/config-controller/templates/controller.j2 b/deploy/adapters/ansible/roles/config-controller/templates/controller.j2
index ae654b47..8061ec1b 100755
--- a/deploy/adapters/ansible/roles/config-controller/templates/controller.j2
+++ b/deploy/adapters/ansible/roles/config-controller/templates/controller.j2
@@ -62,6 +62,15 @@ iface br-external inet static
     address {{ ip_settings[inventory_hostname]["external"]["ip"] }}
     netmask 255.255.255.0
     gateway {{ ip_settings[inventory_hostname]["external"]["gw"] }}
+    offload-sg off
+    # Create veth pair, don't bomb if already exists
+    pre-up ip link add br-external-veth type veth peer name external-nic || true
+    # Set both ends UP
+    pre-up ip link set br-external-veth up
+    pre-up ip link set external-nic up
+    # Delete veth pair on DOWN
+    post-down ip link del br-external-veth || true
+    bridge_ports br-external-veth
 
 # OpenStack Networking VXLAN (tunnel/overlay) bridge
 #