From bc1fcbc9eb188566e4ed6a5f37ad7c4aa199d648 Mon Sep 17 00:00:00 2001 From: Jonathan Rosser Date: Tue, 29 Jan 2019 13:19:28 +0000 Subject: [PATCH] Add an ip address to eth12 in OSA test containers The tempest tests need to ssh to booted virtual machines. The neutron public network is 10.1.3.0/24, which is the flat network on br-vlan. From the container perspective this was previously reached via the default gateway on eth0 as there was no specific route to the 10.1.3.0/24 network. On centos traffic is no longer being forwarded to the br-vlan flat network via the container eth0 and host networking, but this still works for other distributions. This patch adds an IP address to the present, but previously un-addressed interface eth12 in each container. This gives a direct route to the neutron public network from the container and does not require the host network to forward the traffic. The test setup is now more decoupled from the host networking which should increase reliability. Change-Id: Id8fbe05e83bc6d86f57202301e712fc4e8a17003 --- tests/group_vars/all_containers.yml | 3 ++- tests/host_vars/infra1.yml | 1 + tests/host_vars/openstack1.yml | 1 + tests/host_vars/tempest1.yml | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/group_vars/all_containers.yml b/tests/group_vars/all_containers.yml index 0a2006ed..f72c01a3 100644 --- a/tests/group_vars/all_containers.yml +++ b/tests/group_vars/all_containers.yml @@ -27,9 +27,10 @@ container_networks: netmask: "255.255.255.0" type: "veth" vlan_address: + address: "{{ vlan_address }}" bridge: "br-vlan" interface: "eth12" - netmask: null + netmask: "255.255.255.0" type: "veth" physical_host: localhost properties: diff --git a/tests/host_vars/infra1.yml b/tests/host_vars/infra1.yml index 5d137425..34a19112 100644 --- a/tests/host_vars/infra1.yml +++ b/tests/host_vars/infra1.yml @@ -18,3 +18,4 @@ ansible_become: True ansible_user: root container_name: infra1 tunnel_address: 10.1.2.101 +vlan_address: 10.1.3.101 diff --git a/tests/host_vars/openstack1.yml b/tests/host_vars/openstack1.yml index 86dc31fd..7808e9e9 100644 --- a/tests/host_vars/openstack1.yml +++ b/tests/host_vars/openstack1.yml @@ -23,3 +23,4 @@ ansible_user: root container_name: openstack1 tunnel_address: 10.1.2.102 neutron_local_ip: 10.1.2.102 +vlan_address: 10.1.3.102 diff --git a/tests/host_vars/tempest1.yml b/tests/host_vars/tempest1.yml index 62baa797..531527df 100644 --- a/tests/host_vars/tempest1.yml +++ b/tests/host_vars/tempest1.yml @@ -18,3 +18,4 @@ ansible_become: True ansible_user: root container_name: tempest1 tunnel_address: 10.1.2.103 +vlan_address: 10.1.3.103