summaryrefslogtreecommitdiffstats
path: root/xci/installer/osh
diff options
context:
space:
mode:
Diffstat (limited to 'xci/installer/osh')
-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