Skip to content

Commit 2b87509

Browse files
committed
neutron: Remove support for linux bridge mechanism driver
Neutron and kolla already removed it [1][2]. [1] https://review.opendev.org/c/openstack/neutron/+/927216 [2] https://review.opendev.org/c/openstack/kolla-ansible/+/962278 Change-Id: If77366a0f8bb5f6ac3c9951533a2d75c9b0780a9 Signed-off-by: Bartosz Bezak <bartosz@stackhpc.com>
1 parent 8882c87 commit 2b87509

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

ansible/inventory/group_vars/all/kolla

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ overcloud_container_image_regex_map:
208208
enabled: "{{ kolla_enable_multipathd | bool }}"
209209
- regex: "neutron-\\(server\\|metadata-agent\\)"
210210
enabled: "{{ kolla_enable_neutron | bool }}"
211-
- regex: "neutron-\\(dhcp\\|l3\\|linuxbridge\\|openvswitch\\)-agent"
211+
- regex: "neutron-\\(dhcp\\|l3\\|openvswitch\\)-agent"
212212
enabled: "{{ kolla_build_neutron_ovs | default(kolla_enable_neutron | bool and not kolla_enable_ovn | bool) }}"
213213
- regex: neutron-bgp-dragent
214214
enabled: "{{ kolla_enable_neutron_bgp_dragent | bool }}"

ansible/roles/kolla-ansible/templates/kolla/globals.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ docker_registry_username: "{{ kolla_docker_registry_username }}"
119119
#bifrost_network_address_family: "{% raw %}{{ network_address_family }}{% endraw %}"
120120
#dns_address_family: "{% raw %}{{ network_address_family }}{% endraw %}"
121121

122-
# Valid options are [ openvswitch, linuxbridge ]
122+
# Valid options are [ openvswitch, ovn ]
123123
neutron_plugin_agent: "{% if kolla_enable_ovn | default(False) | bool %}ovn{% else %}openvswitch{% endif %}"
124124

125125
# Valid options are [ internal, infoblox ]
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
upgrade:
3+
- |
4+
Support for Linux Bridge mechanism driver has been removed. The driver was
5+
already removed from neutron.

0 commit comments

Comments
 (0)