openstack/neutron
Code Issues Proposed changes

Change neutron-ovs-tempest-dvr-ha-multinode-full job's config

Browse Source 
Now this job runs on 3 nodes:

* 1 main, controller and networker like, without nova-compute service on
  it, this node has "dvr_snat" set as L3 agent's mode,
* 2 compute like nodes with nova compute and L3 agent in "dvr" mode

Even though there is only one "dvr_snat" node in the job, it keeps
"l3_ha" option set to "true" in Neutron's config. That way we are still
testing "ha" code path of the centralized part of the router but also
job is now closer to the real life, and supported deployments topology.

Additionally this patch adds nodeset for 3 nodes with Ubuntu Jammy and
controller node not running compute service as there is no such nodeset
defined globally.

Related-Bug: #1934666

Change-Id: Id6a91795ebc73be26bb34d9eaf8a53b2b6a1ba0c
This commit is contained in:
Slawek Kaplonski 2023-02-21 09:18:51 +01:00
parent 8455edda46
commit 169ef05589
2 changed files with 44 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/source/contributor/testing/ci_scenario_jobs.rst
View File

@ -73,9 +73,9 @@ Below is a summary of those jobs.
| |(only tests related to | | | | | | | | | |
| |Neutron and Nova) | | | | | | | | | |
+----------------------------------------------+----------------------------------+-------+------------------+-------------+-----------------+----------+-------+--------+------------+-------------+
|neutron-ovs-tempest-dvr-ha-multinode-full |tempest.api (without slow tests) | 3 | Ubuntu Jammy | openvswitch | openvswitch | dvr | True | True | True | No |
|(non-voting) |tempest.scenario | | | | | dvr_snat | | | | |
| | | | | | | dvr_snat | | | | |
|neutron-ovs-tempest-dvr-ha-multinode-full |tempest.api (without slow tests) | 3 | Ubuntu Jammy | openvswitch | openvswitch | dvr_snat | True | True | True | No |
|(non-voting) |tempest.scenario | | | | | dvr | | | | |
| | | | | | | dvr | | | | |
+----------------------------------------------+----------------------------------+-------+------------------+-------------+-----------------+----------+-------+--------+------------+-------------+
|neutron-ovs-tempest-slow |tempest slow tests | 2 | Ubuntu Jammy | openvswitch | openvswitch | legacy | False | False | True | Yes |
+----------------------------------------------+----------------------------------+-------+------------------+-------------+-----------------+----------+-------+--------+------------+-------------+

42
zuul.d/tempest-multinode.yaml
View File

@ -1,6 +1,41 @@
- nodeset:
name: neutron-three-node-jammy
nodes:
- name: controller
label: ubuntu-jammy
- name: compute1
label: ubuntu-jammy
- name: compute2
label: ubuntu-jammy
groups:
# Node where tests are executed and test results collected
- name: tempest
nodes:
- controller
# Nodes running the compute service
- name: compute
nodes:
- compute1
- compute2
# Nodes that are not the controller
- name: subnode
nodes:
- compute1
- compute2
# Switch node for multinode networking setup
- name: switch
nodes:
- controller
# Peer nodes for multinode networking setup
- name: peers
nodes:
- compute1
- compute2
- job:
name: neutron-ovs-tempest-dvr-ha-multinode-full
parent: tempest-multinode-full-py3
nodeset: neutron-three-node-jammy
timeout: 10800
roles:
- zuul: openstack/neutron-tempest-plugin
@ -51,6 +86,11 @@
devstack_services:
br-ex-tcpdump: true
br-int-flows: true
# Nova services
# NOTE(slaweq): this node is going to be only control plane and
# networker node with "dvr_snat" L3 agent mode. Other nodes in that job
# are compute nodes with L3 agent in "dvr" mode
n-cpu: false
# Neutron services
q-agt: true
q-dhcp: true
@ -150,7 +190,7 @@
resource_provider_bandwidths: br-ex:1000000:1000000
$NEUTRON_L3_CONF:
DEFAULT:
agent_mode: dvr_snat
agent_mode: dvr
agent:
availability_zone: nova
debug_iptables_rules: True