From: Manuel Buil <mbuil@suse.com>
Date: Wed, 14 Aug 2019 08:05:49 +0000 (+0200)
Subject: Separate vxlan traffic
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=6f177f316999170ec7e1c85605bf48560282edd5;p=releng-xci.git

Separate vxlan traffic

Currently, all traffic is going through the untagged interface. However,
we are creating interfaces for the different traffic. This patch moves
the private traffic (VM-VM), which normally uses vxlan tunnels, to the
interface created for that

deploy-scenario:k8-calico-nofeature
installer-type:osh

Change-Id: I680698d0bf7ab8045d4ca8f7b5bea8c1e1881d71
Signed-off-by: Manuel Buil <mbuil@suse.com>
---

diff --git a/xci/installer/osh/playbooks/roles/install-osh-mini/tasks/main.yml b/xci/installer/osh/playbooks/roles/install-osh-mini/tasks/main.yml
index 20a7c77e..e5df54fa 100644
--- a/xci/installer/osh/playbooks/roles/install-osh-mini/tasks/main.yml
+++ b/xci/installer/osh/playbooks/roles/install-osh-mini/tasks/main.yml
@@ -74,6 +74,12 @@
   args:
     chdir: /root/repos/openstack-helm
 
+- name: Add br-vxlan as the tunnel interface
+  lineinfile:
+    path: /root/repos/openstack-helm/tools/deployment/component/compute-kit/compute-kit.sh
+    regexp: 'tunnel: docker0'
+    line: '    tunnel: br-vxlan'
+
 - name: Deploy Compute Kit (Nova and Neutron)
   command: ./tools/deployment/component/compute-kit/compute-kit.sh
   changed_when: false
diff --git a/xci/installer/osh/playbooks/roles/install-osh-noha/tasks/main.yml b/xci/installer/osh/playbooks/roles/install-osh-noha/tasks/main.yml
index 6f6a7476..befdcfce 100644
--- a/xci/installer/osh/playbooks/roles/install-osh-noha/tasks/main.yml
+++ b/xci/installer/osh/playbooks/roles/install-osh-noha/tasks/main.yml
@@ -83,6 +83,12 @@
   args:
     chdir: /root/repos/openstack-helm
 
+- name: Add br-vxlan as the tunnel interface
+  lineinfile:
+    path: /root/repos/openstack-helm/tools/deployment/multinode/140-compute-kit.sh
+    regexp: 'NETWORK_TUNNEL_DEV="$(network_tunnel_dev)"'
+    line: 'NETWORK_TUNNEL_DEV=br-vxlan'
+
 - name: Deploy Compute Kit (Nova and Neutron)
   command: ./tools/deployment/multinode/140-compute-kit.sh
   changed_when: false