openstack/puppet-neutron
Code Issues Proposed changes

More consistent coverage for [ovs] options

Browse Source 
Update agents options to cover the following [ovs] options
consistently across agents.

 - ovsdb_connection
 - ovsdb_timeout
 - integration_bridge

Change-Id: Id01e568f2f52f14334f2e0ffffcf1f385258f577
This commit is contained in:
Takashi Kajinami 2024-09-15 23:41:47 +09:00
parent 28d16299c0
commit bc720e996f
4 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/agents/dhcp.pp
View File

@ -103,6 +103,10 @@
# (optional) The URI used to connect to the local OVSDB server
# Defaults to $facts['os_service_default']
#
# [*ovsdb_timeout*]
# (Optional) The timeout in seconds for OVSDB commands.
# Defaults to $facts['os_service_default']
#
# [*ovsdb_agent_ssl_key_file*]
# (optional) The SSL key file to use for Neutron agents to connect to OVSDB
# Defaults to $facts['os_service_default']
@ -149,6 +153,7 @@ class neutron::agents::dhcp (
$availability_zone = $facts['os_service_default'],
$ovs_integration_bridge = $facts['os_service_default'],
$ovsdb_connection = $facts['os_service_default'],
$ovsdb_timeout = $facts['os_service_default'],
$ovsdb_agent_ssl_key_file = $facts['os_service_default'],
$ovsdb_agent_ssl_cert_file = $facts['os_service_default'],
$ovsdb_agent_ssl_ca_file = $facts['os_service_default'],
@ -211,8 +216,9 @@ class neutron::agents::dhcp (
}
neutron_dhcp_agent_config {
'ovs/ovsdb_connection': value => $ovsdb_connection;
'ovs/integration_bridge': value => $ovs_integration_bridge;
'ovs/ovsdb_connection': value => $ovsdb_connection;
'ovs/ovsdb_timeout': value => $ovsdb_timeout;
'ovs/ssl_key_file': value => $ovsdb_agent_ssl_key_file;
'ovs/ssl_cert_file': value => $ovsdb_agent_ssl_cert_file;
'ovs/ssl_ca_cert_file': value => $ovsdb_agent_ssl_ca_file;

12
manifests/agents/l3.pp
View File

@ -105,6 +105,14 @@
# (optional) Name of Open vSwitch bridge to use
# Defaults to $facts['os_service_default']
#
# [*ovsdb_connection*]
# (optional) The URI used to connect to the local OVSDB server
# Defaults to $facts['os_service_default']
#
# [*ovsdb_timeout*]
# (Optional) The timeout in seconds for OVSDB commands.
# Defaults to $facts['os_service_default']
#
# [*network_log_rate_limit*]
# (Optional) Maximum packets logging per second.
# Used by logging service plugin.
@ -145,6 +153,8 @@ class neutron::agents::l3 (
$rpc_response_max_timeout = $facts['os_service_default'],
$radvd_user = $facts['os_service_default'],
$ovs_integration_bridge = $facts['os_service_default'],
$ovsdb_connection = $facts['os_service_default'],
$ovsdb_timeout = $facts['os_service_default'],
$network_log_rate_limit = $facts['os_service_default'],
$network_log_burst_limit = $facts['os_service_default'],
$network_log_local_output_log_base = $facts['os_service_default'],
@ -182,6 +192,8 @@ class neutron::agents::l3 (
'DEFAULT/agent_mode': value => $agent_mode;
'DEFAULT/radvd_user': value => $radvd_user;
'ovs/integration_bridge': value => $ovs_integration_bridge;
'ovs/ovsdb_connection': value => $ovsdb_connection;
'ovs/ovsdb_timeout': value => $ovsdb_timeout;
'agent/availability_zone': value => $availability_zone;
'agent/extensions': value => join(any2array($extensions), ',');
'agent/report_interval': value => $report_interval;

6
manifests/agents/ml2/ovs.pp
View File

@ -42,6 +42,10 @@
# (Optional) List of <physical_network>:<bridge>
# Defaults to empty list
#
# [*ovsdb_connection*]
# (optional) The URI used to connect to the local OVSDB server
# Defaults to $facts['os_service_default']
#
# [*ovsdb_timeout*]
# (Optional) The timeout in seconds for OVSDB commands.
# Defaults to $facts['os_service_default']
@ -281,6 +285,7 @@ class neutron::agents::ml2::ovs (
$extensions = $facts['os_service_default'],
$bridge_uplinks = [],
$bridge_mappings = [],
$ovsdb_connection = $facts['os_service_default'],
$ovsdb_timeout = $facts['os_service_default'],
$of_listen_address = $facts['os_service_default'],
$of_listen_port = $facts['os_service_default'],
@ -498,6 +503,7 @@ class neutron::agents::ml2::ovs (
'agent/minimize_polling': value => $minimize_polling;
'agent/tunnel_csum': value => $tunnel_csum;
'agent/explicitly_egress_direct': value => $explicitly_egress_direct;
'ovs/ovsdb_connection': value => $ovsdb_connection;
'ovs/ovsdb_timeout': value => $ovsdb_timeout;
'ovs/of_listen_address': value => $of_listen_address;
'ovs/of_listen_port': value => $of_listen_port;

9
releasenotes/notes/ovsdb-opts-d9abd57580377d8b.yaml Normal file
View File

@ -0,0 +1,9 @@
---
features:
- |
The following parameters have been added.
- ``neutron::agents::dhcp::ovsdb_timeout``
- ``neutron::agents::l3::ovsdb_connection``
- ``neutron::agents::l3::ovsdb_timeout``
- ``neutron::agents::ml2::ovs::ovsdb_connection``