Merge "Correctly create the dhcp_agent.ini and l3_agent.ini" into stable/wallaby

Author: Zuul

ansible/roles/neutron/templates/dhcp_agent.ini.j2

@@ -17,5 +17,7 @@ dhcp_override_mac = {{ vmware_dvs_dhcp_override_mac }}
 {% endif %}
 {% endif %}
 
+{% if neutron_plugin_agent in ['openvswitch', 'ovn'] %}
 [ovs]
 ovsdb_connection = tcp:127.0.0.1:{{ ovsdb_port }}
+{% endif %}

ansible/roles/neutron/templates/l3_agent.ini.j2

@@ -26,5 +26,7 @@ enable_detailed_logging = {{ neutron_logging_debug }}
 vpn_device_driver = {{ vpn_device_driver }}
 {% endif %}
 
+{% if neutron_plugin_agent in ['openvswitch', 'ovn'] %}
 [ovs]
 ovsdb_connection = tcp:127.0.0.1:{{ ovsdb_port }}
+{% endif %}