Improve neutron images regex

Match ML2/OVS agents only when OVN is not enabled.

Change-Id: Ia2ba7414202de6750b18ada47e7a5bb0b636e7b3

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