From d9ee59ea1bdf21f50f5798278b5f6c75bf638a04 Mon Sep 17 00:00:00 2001
From: Michal Nasiadka <mnasiadka@gmail.com>
Date: Thu, 2 Nov 2023 07:43:22 +0100
Subject: [PATCH] Improve neutron images regex
Match ML2/OVS agents only when OVN is not enabled.
Change-Id: Ia2ba7414202de6750b18ada47e7a5bb0b636e7b3
---
ansible/inventory/group_vars/all/kolla | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/ansible/inventory/group_vars/all/kolla b/ansible/inventory/group_vars/all/kolla
index 225fe057..9a661f12 100644
--- a/ansible/inventory/group_vars/all/kolla
+++ b/ansible/inventory/group_vars/all/kolla
@@ -199,10 +199,10 @@ overcloud_container_image_regex_map:
enabled: "{{ kolla_enable_multipathd | bool }}"
- regex: ^murano
enabled: "{{ kolla_enable_murano | bool }}"
- - regex: neutron-server
- enabled: "{{ kolla_enable_neutron | bool }}"
- - regex: "neutron-\\(dhcp\\|l3\\|metadata\\|linuxbridge\\|openvswitch\\)-agent"
+ - regex: "neutron-\\(server\\|metadata-agent\\)"
enabled: "{{ kolla_enable_neutron | bool }}"
+ - regex: "neutron-\\(dhcp\\|l3\\|linuxbridge\\|openvswitch\\)-agent"
+ enabled: "{{ kolla_enable_neutron | bool and not kolla_enable_ovn | bool}}"
- regex: neutron-mlnx-agent
enabled: "{{ kolla_enable_neutron_mlnx | bool }}"
- regex: neutron-ovn-agent
--
GitLab