openstack/kolla-ansible
Code Issues Proposed changes

Merge "Add a ovsdb_timeout variable for better configuration"

Browse Source
This commit is contained in:
Zuul 2021-09-09 11:01:11 +00:00 committed by Gerrit Code Review
commit 2bd945b0f6
5 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/neutron/defaults/main.yml
View File

@ -530,6 +530,8 @@ neutron_tls_proxy_extra_volumes: "{{ neutron_extra_volumes }}"
dhcp_agents_per_network: 2
max_l3_agents_per_router: 3
ovsdb_timeout: 10
neutron_logging_debug: "{{ openstack_logging_debug }}"
openstack_neutron_auth: "{{ openstack_auth }}"

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

@ -19,3 +19,4 @@ dhcp_override_mac = {{ vmware_dvs_dhcp_override_mac }}
[ovs]
ovsdb_connection = tcp:127.0.0.1:{{ ovsdb_port }}
ovsdb_timeout = {{ ovsdb_timeout }}

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

@ -28,3 +28,4 @@ vpn_device_driver = {{ vpn_device_driver }}
[ovs]
ovsdb_connection = tcp:127.0.0.1:{{ ovsdb_port }}
ovsdb_timeout = {{ ovsdb_timeout }}

3
ansible/roles/neutron/templates/neutron_ovn_metadata_agent.ini.j2
View File

@ -10,7 +10,8 @@ log_dir = /var/log/kolla/neutron
metadata_workers = 2
[ovs]
ovsdb_connection = tcp:127.0.0.1:6640
ovsdb_connection = tcp:127.0.0.1:{{ ovsdb_port }}
ovsdb_timeout = {{ ovsdb_timeout }}
[ovn]
ovn_nb_connection = {{ ovn_nb_connection }}

1
ansible/roles/neutron/templates/openvswitch_agent.ini.j2
View File

@ -19,6 +19,7 @@ bridge_mappings = {% for bridge in neutron_bridge_name.split(',') %}physnet{{ lo
{% endif %}
datapath_type = {{ ovs_datapath }}
ovsdb_connection = tcp:127.0.0.1:{{ ovsdb_port }}
ovsdb_timeout = {{ ovsdb_timeout }}
local_ip = {{ tunnel_interface_address }}
{% if enable_nova_fake | bool %}
integration_bridge = br-int-{{ item }}