From 2bfed5623bc2f14661987b4c71ea8ef16bdef8cd Mon Sep 17 00:00:00 2001 From: Seunghun Lee Date: Mon, 5 Feb 2024 09:48:51 +0000 Subject: [PATCH] Change condition of neutron agent container image regex Add variable kolla_enable_neutron_ovs to make enabling both ovn and ovs possible. Retain old condition as default value to ensure regex mapping works normally when kolla_enable_neutron_ovs is not given. --- ansible/group_vars/all/kolla | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/group_vars/all/kolla b/ansible/group_vars/all/kolla index d2375b555..007d650b5 100644 --- a/ansible/group_vars/all/kolla +++ b/ansible/group_vars/all/kolla @@ -207,7 +207,7 @@ overcloud_container_image_regex_map: enabled: "{{ kolla_enable_neutron | bool }}" # Neutron SFC agent not currently supported on CentOS binary builds. - regex: "neutron-\\(dhcp\\|l3\\|linuxbridge\\|openvswitch\\)-agent" - enabled: "{{ kolla_enable_neutron | bool and not kolla_enable_ovn | bool}}" + enabled: "{{ kolla_enable_neutron_ovs | default(kolla_enable_neutron | bool and not kolla_enable_ovn | bool) }}" - regex: neutron-mlnx-agent enabled: "{{ kolla_enable_neutron_mlnx | bool }}" - regex: neutron-sriov-agent