From 78260f98e40da6671eb25fc98c9d1c8d6cd2f978 Mon Sep 17 00:00:00 2001 From: Maksim Malchuk Date: Sun, 10 Oct 2021 23:55:00 +0300 Subject: [PATCH] Correctly create the dhcp_agent.ini and l3_agent.ini The section [ovs] is needed only for ovs/ovn configurations. TrivialFix Change-Id: If9015b8f53c04cf3257331449ebd50163fabcab0 Signed-off-by: Maksim Malchuk --- ansible/roles/neutron/templates/dhcp_agent.ini.j2 | 2 ++ ansible/roles/neutron/templates/l3_agent.ini.j2 | 2 ++ 2 files changed, 4 insertions(+) diff --git a/ansible/roles/neutron/templates/dhcp_agent.ini.j2 b/ansible/roles/neutron/templates/dhcp_agent.ini.j2 index 2c525a1b04..7b96582402 100644 --- a/ansible/roles/neutron/templates/dhcp_agent.ini.j2 +++ b/ansible/roles/neutron/templates/dhcp_agent.ini.j2 @@ -17,6 +17,8 @@ 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 }} ovsdb_timeout = {{ ovsdb_timeout }} +{% endif %} diff --git a/ansible/roles/neutron/templates/l3_agent.ini.j2 b/ansible/roles/neutron/templates/l3_agent.ini.j2 index df5d73d89e..32b0a984c8 100644 --- a/ansible/roles/neutron/templates/l3_agent.ini.j2 +++ b/ansible/roles/neutron/templates/l3_agent.ini.j2 @@ -26,6 +26,8 @@ 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 }} ovsdb_timeout = {{ ovsdb_timeout }} +{% endif %}