Merge "Load qos to avoid missing qos-fip on OVN gates"

This commit is contained in:
Zuul 2020-10-08 19:55:46 +00:00 committed by Gerrit Code Review
commit b3a31aa323
1 changed files with 5 additions and 2 deletions

View File

@ -26,7 +26,7 @@
vars:
devstack_localrc:
Q_AGENT: ovn
ML2_L3_PLUGIN: ovn-router,trunk
ML2_L3_PLUGIN: ovn-router,trunk,qos
OVN_DBS_LOG_LEVEL: dbg
Q_ML2_PLUGIN_MECHANISM_DRIVERS: ovn,logger
Q_ML2_PLUGIN_TYPE_DRIVERS: local,flat,vlan,geneve
@ -49,6 +49,7 @@
q-dhcp: false
q-meta: false
q-trunk: true
q-qos: true
ovs-vswitchd: true
ovsdb-server: true
zuul_copy_output:
@ -134,6 +135,7 @@
OCTAVIA_AMP_IMAGE_SIZE: 3
OCTAVIA_AMP_IMAGE_NAME: "test-only-amphora-x64-haproxy-ubuntu-bionic"
Q_AGENT: ovn
ML2_L3_PLUGIN: ovn-router,trunk,qos
Q_ML2_PLUGIN_MECHANISM_DRIVERS: ovn,logger
Q_ML2_PLUGIN_TYPE_DRIVERS: local,flat,vlan,geneve
Q_ML2_TENANT_NETWORK_TYPE: geneve
@ -142,7 +144,7 @@
PHYSICAL_NETWORK: public
OVN_L3_CREATE_PUBLIC_NETWORK: true
ENABLE_CHASSIS_AS_GW: true
OVN_BRANCH: branch-20.06
OVN_BRANCH: v20.06.1
KURYR_NEUTRON_DEFAULT_ROUTER: kuryr-router
KURYR_EP_DRIVER_OCTAVIA_PROVIDER: ovn
KURYR_K8S_OCTAVIA_MEMBER_MODE: L2
@ -168,6 +170,7 @@
q-dhcp: false
q-meta: false
q-trunk: true
q-qos: true
devstack_local_conf:
post-config:
$OCTAVIA_CONF: