summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManuel Buil <mbuil@suse.com>2019-08-14 10:05:49 +0200
committerManuel Buil <mbuil@suse.com>2019-08-14 16:04:27 +0200
commit6f177f316999170ec7e1c85605bf48560282edd5 (patch)
treeada24c7b78dc4a04a4260f350ee7a6123cca085c
parent5e82be1462e6ceebaffa37a24a9e53a788b71fae (diff)
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>
-rw-r--r--xci/installer/osh/playbooks/roles/install-osh-mini/tasks/main.yml6
-rw-r--r--xci/installer/osh/playbooks/roles/install-osh-noha/tasks/main.yml6
2 files changed, 12 insertions, 0 deletions
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