fix external veth pair

JIRA: COMPASS-604

Fix name of external veth pair too long issue

Change-Id: Iae4ac3bac3f528875d7c8b40ea76e0c89c28b9a0
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 60cb12a..e7b7943 100644 (file)
--- 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-external-veth type veth peer name external-nic || true
+    pre-up ip link add 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-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
+    post-down ip link del external-veth || true
+    bridge_ports 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 8061ec1..99d6287 100755 (executable)
--- a/deploy/adapters/ansible/roles/config-controller/templates/controller.j2
+++ b/deploy/adapters/ansible/roles/config-controller/templates/controller.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-external-veth type veth peer name external-nic || true
+    pre-up ip link add 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-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
+    post-down ip link del external-veth || true
+    bridge_ports external-veth
 
 # OpenStack Networking VXLAN (tunnel/overlay) bridge
 #