Skip to content

Commit

Permalink
Change condition of neutron agent container image regex
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
seunghun1ee committed Feb 5, 2024
1 parent 73030e2 commit 2bfed56
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion ansible/group_vars/all/kolla
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 2bfed56

Please sign in to comment.