summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarry Huang <huangxiangyu5@huawei.com>2018-07-19 11:04:52 +0800
committerHarry Huang <huangxiangyu5@huawei.com>2018-07-19 11:04:52 +0800
commit9edbc92c22cddb01658df1cd5724f5ec90e7f2e4 (patch)
treeb0b2a0402f6f3ad78545bd3d5c7236bff93eacd1
parent0f0f1b1b03cfa1d2e5e57d7e73f5be2901724ca4 (diff)
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>
-rw-r--r--deploy/adapters/ansible/roles/config-compute/templates/compute.j28
-rwxr-xr-xdeploy/adapters/ansible/roles/config-controller/templates/controller.j28
2 files changed, 8 insertions, 8 deletions
diff --git a/deploy/adapters/ansible/roles/config-compute/templates/compute.j2 b/deploy/adapters/ansible/roles/config-compute/templates/compute.j2
index 60cb12ac..e7b79436 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-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 8061ec1b..99d62876 100755
--- 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
#