Skip to content

Commit cbf9b2b

Browse files
committed
update nova-next and nova-ovs-hybrid-plug to disable linuxbridge
neutron now declares linuxbridge experimental and requires it to be enabled by a new config option. We do not set that in these jobs so the neutron server fails to load since we enable the linux bridge mech driver. we do not actully use linuxbridge in these jobs so this patch just disables the mech driver. Change-Id: I129a850c3327498d26d899c7709f5749622afdd8 Closes-Bug: #1980948
1 parent 512fbdf commit cbf9b2b

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

.zuul.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@
135135
devstack_localrc:
136136
Q_AGENT: openvswitch
137137
Q_ML2_TENANT_NETWORK_TYPE: vxlan
138-
Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch,linuxbridge
138+
Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch
139139
ML2_L3_PLUGIN: router
140140
devstack_services:
141141
# Disable OVN services
@@ -162,7 +162,7 @@
162162
devstack_localrc:
163163
Q_AGENT: openvswitch
164164
Q_ML2_TENANT_NETWORK_TYPE: vxlan
165-
Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch,linuxbridge
165+
Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch
166166
ML2_L3_PLUGIN: router
167167
devstack_services:
168168
# Disable OVN services
@@ -391,7 +391,7 @@
391391
devstack_localrc:
392392
Q_AGENT: openvswitch
393393
Q_ML2_TENANT_NETWORK_TYPE: vxlan
394-
Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch,linuxbridge
394+
Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch
395395
ML2_L3_PLUGIN: router
396396
# Enable TLS between the noVNC proxy & compute nodes; this requires
397397
# the tls-proxy service to be enabled. Added in Queens.
@@ -430,7 +430,7 @@
430430
devstack_localrc:
431431
Q_AGENT: openvswitch
432432
Q_ML2_TENANT_NETWORK_TYPE: vxlan
433-
Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch,linuxbridge
433+
Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch
434434
ML2_L3_PLUGIN: router
435435
NOVA_CONSOLE_PROXY_COMPUTE_TLS: True
436436
FORCE_CONFIG_DRIVE: True

0 commit comments

Comments
 (0)