openstack/puppet-neutron
Code Issues Proposed changes

Add support for [ovs] of_listen_address/port

Browse Source 
... so that we can use IPv6 address instead of the default IPv4 local
address.

Change-Id: I5baa7e7dfac33e267790525dc1e8b963c3166cc0
This commit is contained in:
Takashi Kajinami 2023-03-07 23:10:04 +09:00
parent 4f9ea57cb2
commit ac2dbf94c9
3 changed files with 40 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,6 +46,14 @@
# (Optional) The timeout in seconds for OVSDB commands.
# Defaults to $facts['os_service_default']
#
# [*of_listen_address*]
# (Optional) Address to listen on for OpenFlow connections.
# Defaults to $facts['os_service_default']
#
# [*of_listen_port*]
# (Optional) Port to listen on for OpenFlow connections.
# Defaults to $facts['os_service_default']
#
# [*of_connect_timeout*]
# (Optional) Timeout in seconds to wait for the local switch
# connecting to the controller.
@ -259,6 +267,8 @@ class neutron::agents::ml2::ovs (
$bridge_uplinks = [],
$bridge_mappings = [],
$ovsdb_timeout = $facts['os_service_default'],
$of_listen_address = $facts['os_service_default'],
$of_listen_port = $facts['os_service_default'],
$of_connect_timeout = $facts['os_service_default'],
$of_request_timeout = $facts['os_service_default'],
$of_inactivity_probe = $facts['os_service_default'],
@ -466,6 +476,8 @@ class neutron::agents::ml2::ovs (
'agent/tunnel_csum': value => $tunnel_csum;
'agent/explicitly_egress_direct': value => $explicitly_egress_direct;
'ovs/ovsdb_timeout': value => $ovsdb_timeout;
'ovs/of_listen_address': value => $of_listen_address;
'ovs/of_listen_port': value => $of_listen_port;
'ovs/of_connect_timeout': value => $of_connect_timeout;
'ovs/of_request_timeout': value => $of_request_timeout;
'ovs/of_inactivity_probe': value => $of_inactivity_probe;

5
releasenotes/notes/of_listen_address-and-port-5aad4dd86516f7ed.yaml Normal file
View File

@ -0,0 +1,5 @@
---
features:
- |
The ``neutron::agents::ml2::ovs`` class now supports
the ``of_listen_address`` parameter and the ``of_listen_port`` parameter.

25
spec/classes/neutron_agents_ml2_ovs_spec.rb
View File

@ -50,6 +50,8 @@ describe 'neutron::agents::ml2::ovs' do
should contain_neutron_agent_ovs('ovs/datapath_type').with_value('<SERVICE DEFAULT>')
should contain_neutron_agent_ovs('ovs/vhostuser_socket_dir').with_value('<SERVICE DEFAULT>')
should contain_neutron_agent_ovs('ovs/ovsdb_timeout').with_value('<SERVICE DEFAULT>')
should contain_neutron_agent_ovs('ovs/of_listen_address').with_value('<SERVICE DEFAULT>')
should contain_neutron_agent_ovs('ovs/of_listen_port').with_value('<SERVICE DEFAULT>')
should contain_neutron_agent_ovs('ovs/of_connect_timeout').with_value('<SERVICE DEFAULT>')
should contain_neutron_agent_ovs('ovs/of_request_timeout').with_value('<SERVICE DEFAULT>')
should contain_neutron_agent_ovs('ovs/of_inactivity_probe').with_value('<SERVICE DEFAULT>')
@ -271,10 +273,29 @@ describe 'neutron::agents::ml2::ovs' do
end
end
context 'when setting of_listen_address and of_listen_port' do
before :each do
params.merge!(
:of_listen_address => '127.0.0.1',
:of_listen_port => 6633,
)
end
it 'configures of_listen_address' do
should contain_neutron_agent_ovs('ovs/of_listen_address').with_value(params[:of_listen_address])
end
it 'configures of_listen_port' do
should contain_neutron_agent_ovs('ovs/of_listen_port').with_value(params[:of_listen_port])
end
end
context 'when setting of_connect_timeout and of_request_timeout' do
before :each do
params.merge!( :of_connect_timeout => 30,
:of_request_timeout => 20 )
params.merge!(
:of_connect_timeout => 30,
:of_request_timeout => 20
)
end
it 'configures of_connect_timeout' do