From 4ac7f6f3a0d1aa23aa805ccc261fd004ad9fe880 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= Date: Tue, 18 Feb 2020 20:46:57 +0100 Subject: [PATCH] CI: Replace dummy interface (fake for neutron external) with VXLAN This allows for some real testing, especially in a multinode environment. Change-Id: Ic96819fefe460e14c8460e52a78d9b0d034edc80 --- tests/deploy.sh | 3 --- tests/pre.yml | 6 +++++- tests/templates/globals-default.j2 | 2 +- zuul.d/base.yaml | 1 + 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/tests/deploy.sh b/tests/deploy.sh index 7d7c130d1f..a83c3e1c50 100755 --- a/tests/deploy.sh +++ b/tests/deploy.sh @@ -10,9 +10,6 @@ export PYTHONUNBUFFERED=1 function deploy { RAW_INVENTORY=/etc/kolla/inventory - # Create dummy interface for neutron - ansible -m shell -i ${RAW_INVENTORY} -b -a "ip l a fake_interface type dummy" all - #TODO(inc0): Post-deploy complains that /etc/kolla is not writable. Probably we need to include become there sudo chmod -R 777 /etc/kolla # generate self-signed certificates for the optional internal TLS tests diff --git a/tests/pre.yml b/tests/pre.yml index 864194ffba..504e650823 100644 --- a/tests/pre.yml +++ b/tests/pre.yml @@ -9,13 +9,17 @@ - role: multi-node-vxlan-overlay vars: vxlan_interface_name: "{{ api_interface_name }}" - vxlan_vni: 10001 + vxlan_vni: 10000 - role: multi-node-managed-addressing vars: managed_interface_name: "{{ api_interface_name }}" managed_network_prefix: "{{ api_network_prefix }}" managed_network_prefix_length: "{{ api_network_prefix_length }}" managed_network_address_family: "{{ address_family }}" + - role: multi-node-vxlan-overlay + vars: + vxlan_interface_name: "{{ neutron_external_interface_name }}" + vxlan_vni: 10001 tasks: - name: Ensure /tmp/logs/ dir file: diff --git a/tests/templates/globals-default.j2 b/tests/templates/globals-default.j2 index fe11a30e07..c458bbcc7d 100644 --- a/tests/templates/globals-default.j2 +++ b/tests/templates/globals-default.j2 @@ -29,7 +29,7 @@ enable_heat: "{{ openstack_core_tested }}" {% if scenario != 'bifrost' %} kolla_internal_vip_address: "{{ kolla_internal_vip_address }}" -neutron_external_interface: "fake_interface" +neutron_external_interface: "{{ neutron_external_interface_name }}" openstack_logging_debug: "True" openstack_service_workers: "1" {% endif %} diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml index 47310801d1..dc30e6ac44 100644 --- a/zuul.d/base.yaml +++ b/zuul.d/base.yaml @@ -32,6 +32,7 @@ api_interface_name: vxlan0 kolla_internal_vip_address: "192.0.2.10" address_family: 'ipv4' + neutron_external_interface_name: vxlan1 tls_enabled: false roles: - zuul: zuul/zuul-jobs