openstack/kolla-ansible
Code Issues Proposed changes

Merge "Correctly create the dhcp_agent.ini and l3_agent.ini"

Browse Source
This commit is contained in:
Zuul
2021-10-12 00:04:31 +00:00
committed by Gerrit Code Review
parent 6ee1661d96 78260f98e4
commit 525161d2af
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/neutron/templates/dhcp_agent.ini.j2
View File

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

2
ansible/roles/neutron/templates/l3_agent.ini.j2
View File

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