Merge "[DHCP agent] Fix route to OVN metadata port for non-isolated networks" into stable/2023.1

Author: Zuul

neutron/agent/linux/dhcp.py

@@ -1290,7 +1290,7 @@ def _generate_opts_per_subnet(self):
                     if subnet_dhcp_ip:
                         metadata_route_ip = subnet_dhcp_ip
 
-                if not isolated_subnets[subnet.id] and gateway:
+                elif not isolated_subnets[subnet.id] and gateway:
                     metadata_route_ip = gateway
 
                 if metadata_route_ip: