Use default neutron backend in the base grenade job
When devstack was switching to ML2/OVN as default backend, in the base grenade job it was explicitly configured to use old default ML2/OVS backend. It was done like that to avoid problems with upgrade and change backend in the same job. Now, as ML2/OVN is default backend in Devstack since at least couple of cycles it's fine to switch grenade jobs to use default backend. Depends-On: https://review.opendev.org/c/openstack/ironic/+/866993 Depends-On: https://review.opendev.org/c/openstack/devstack/+/867065 Change-Id: Iede9fe71d81fc86a92122800d5a16f45442dd79e
This commit is contained in:
parent
b1cd7a1866
commit
0dd1e186b5
52
.zuul.yaml
52
.zuul.yaml
|
@ -40,6 +40,7 @@
|
||||||
- zuul: opendev.org/openstack/openstack-zuul-jobs
|
- zuul: opendev.org/openstack/openstack-zuul-jobs
|
||||||
- zuul: opendev.org/openstack/devstack
|
- zuul: opendev.org/openstack/devstack
|
||||||
- zuul: opendev.org/openstack/tempest
|
- zuul: opendev.org/openstack/tempest
|
||||||
|
- zuul: opendev.org/openstack/neutron-tempest-plugin
|
||||||
vars:
|
vars:
|
||||||
devstack_bases:
|
devstack_bases:
|
||||||
shared: /opt/stack
|
shared: /opt/stack
|
||||||
|
@ -78,13 +79,6 @@
|
||||||
ERROR_ON_CLONE: true
|
ERROR_ON_CLONE: true
|
||||||
# Gate jobs can't deal with nested virt. Disable it.
|
# Gate jobs can't deal with nested virt. Disable it.
|
||||||
LIBVIRT_TYPE: qemu
|
LIBVIRT_TYPE: qemu
|
||||||
# TODO(jlibosva): Devstack defaults to OVN but OVN Grenade
|
|
||||||
# as of early Victoria does not work. We can
|
|
||||||
# remove setting explicitly ML2/OVS mech
|
|
||||||
# driver for Grenade once OVN works with Grenade.
|
|
||||||
Q_AGENT: openvswitch
|
|
||||||
Q_ML2_TENANT_NETWORK_TYPE: vxlan
|
|
||||||
Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch
|
|
||||||
# TODO(slaweq): It can be removed when devstack patch
|
# TODO(slaweq): It can be removed when devstack patch
|
||||||
# https://review.opendev.org/c/openstack/devstack/+/849145 will be
|
# https://review.opendev.org/c/openstack/devstack/+/849145 will be
|
||||||
# merged in master and last stable branch
|
# merged in master and last stable branch
|
||||||
|
@ -234,25 +228,18 @@
|
||||||
# Neutron services
|
# Neutron services
|
||||||
# We need to keep using the neutron-legacy based services for
|
# We need to keep using the neutron-legacy based services for
|
||||||
# now until all issues with the new lib/neutron code are solved
|
# now until all issues with the new lib/neutron code are solved
|
||||||
# TODO(jlibosva): Devstack defaults to OVN but OVN Grenade
|
|
||||||
# as of early Victoria does not work. We can
|
|
||||||
# remove setting explicitly ML2/OVS mech
|
|
||||||
# driver for Grenade once OVN works with Grenade.
|
|
||||||
q-agt: true
|
|
||||||
q-dhcp: true
|
|
||||||
q-l3: true
|
|
||||||
q-meta: true
|
|
||||||
q-metering: true
|
|
||||||
q-svc: true
|
q-svc: true
|
||||||
ovn-controller: false
|
q-agt: false
|
||||||
ovn-northd: false
|
q-dhcp: false
|
||||||
q-ovn-metadata-agent: false
|
q-l3: false
|
||||||
# neutron-api: true
|
q-meta: false
|
||||||
# neutron-agent: true
|
q-metering: false
|
||||||
# neutron-dhcp: true
|
q-dns: true
|
||||||
# neutron-l3: true
|
q-ovn-metadata-agent: true
|
||||||
# neutron-metadata-agent: true
|
ovn-controller: true
|
||||||
# neutron-metering: true
|
ovn-northd: true
|
||||||
|
ovs-vswitchd: true
|
||||||
|
ovsdb-server: true
|
||||||
neutron-trunk: true
|
neutron-trunk: true
|
||||||
# Swift services
|
# Swift services
|
||||||
s-account: true
|
s-account: true
|
||||||
|
@ -290,8 +277,18 @@
|
||||||
# Neutron services
|
# Neutron services
|
||||||
# We need to keep using the neutron-legacy based services for
|
# We need to keep using the neutron-legacy based services for
|
||||||
# now until all issues with the new lib/neutron code are solved
|
# now until all issues with the new lib/neutron code are solved
|
||||||
q-agt: true
|
ovn-controller: true
|
||||||
# neutron-agent: true
|
ovn-northd: false
|
||||||
|
ovs-vswitchd: true
|
||||||
|
ovsdb-server: true
|
||||||
|
q-fake: true
|
||||||
|
q-svc: false
|
||||||
|
q-agt: false
|
||||||
|
q-dhcp: false
|
||||||
|
q-l3: false
|
||||||
|
q-meta: false
|
||||||
|
q-metering: false
|
||||||
|
q-ovn-metadata-agent: true
|
||||||
# Cinder services
|
# Cinder services
|
||||||
c-bak: true
|
c-bak: true
|
||||||
c-vol: true
|
c-vol: true
|
||||||
|
@ -373,6 +370,7 @@
|
||||||
Basic multinode grenade job
|
Basic multinode grenade job
|
||||||
parent: grenade
|
parent: grenade
|
||||||
nodeset: openstack-two-node-focal
|
nodeset: openstack-two-node-focal
|
||||||
|
pre-run: playbooks/multinode-pre.yaml
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: grenade-skip-level
|
name: grenade-skip-level
|
||||||
|
|
|
@ -0,0 +1,4 @@
|
||||||
|
- hosts: all
|
||||||
|
roles:
|
||||||
|
- multi-node-bridge
|
||||||
|
- multi-node-setup
|
Loading…
Reference in New Issue