diff options
| author |   Harry Huang <huangxiangyu5@huawei.com> | 2018-07-16 17:26:35 +0800 |
|---|---|---|
| committer | Harry Huang <huangxiangyu5@huawei.com> | 2018-07-16 17:26:35 +0800 |
| commit | 7811e71b5c7eb4884be9d66b6c0d4cf30def87fb (patch) | |
| tree | 235c989d83d4f0812dee247432c6263dc6f25cab /deploy | |
| parent | 568068caa189a8643cdd53de774259ab76297d43 (diff) | |
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>
Diffstat (limited to 'deploy')
| -rw-r--r-- | deploy/adapters/ansible/roles/config-compute/templates/compute.j2 | 10 | ||||
| -rwxr-xr-x | deploy/adapters/ansible/roles/config-controller/templates/controller.j2 | 9 |
2 files changed, 14 insertions, 5 deletions
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 # |