Skip to content

Commit b9c8846

Browse files
committed
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 <[email protected]> (cherry picked from commit 78260f9)
1 parent 0f4b6e4 commit b9c8846

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,7 @@ dhcp_override_mac = {{ vmware_dvs_dhcp_override_mac }}
1717
{% endif %}
1818
{% endif %}
1919

20+
{% if neutron_plugin_agent in ['openvswitch', 'ovn'] %}
2021
[ovs]
2122
ovsdb_connection = tcp:127.0.0.1:{{ ovsdb_port }}
23+
{% endif %}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,7 @@ enable_detailed_logging = {{ neutron_logging_debug }}
2626
vpn_device_driver = {{ vpn_device_driver }}
2727
{% endif %}
2828

29+
{% if neutron_plugin_agent in ['openvswitch', 'ovn'] %}
2930
[ovs]
3031
ovsdb_connection = tcp:127.0.0.1:{{ ovsdb_port }}
32+
{% endif %}

0 commit comments

Comments
 (0)