openstack
/
puppet-neutron
Code Issues Proposed changes

ovn-agent: Support [agent] extensions option 

The ovn-agent service in recent neutron versions support extensions
mechanism to enable additional features.

Change-Id: I725183b3b3b69a1f9636f4b44758932ab7bfde02
This commit is contained in:
Takashi Kajinami 2024-03-16 18:23:18 +09:00
parent 53d7c4ffaa
commit 97b558f328
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/agents/ml2/ovn.pp
View File

@ -15,7 +15,11 @@
# Defaults to true
#
# [*debug*]
# Debug. Defaults to $facts['os_service_default'].
# (optional) Debug. Defaults to $facts['os_service_default'].
#
# [*extensions*]
# (optional) Extension list to use.
# Defaults to $facts['os_service_default']
#
# [*ovsdb_connection*]
# (optional) The URI used to connect to the local OVSDB server.
@ -105,6 +109,7 @@ class neutron::agents::ml2::ovn (
Boolean $enabled = true,
Boolean $manage_service = true,
$debug = $facts['os_service_default'],
$extensions = $facts['os_service_default'],
$ovsdb_connection = 'tcp:127.0.0.1:6640',
$ovs_manager = 'ptcp:6640:127.0.0.1',
$ovn_nb_connection = $facts['os_service_default'],
@ -135,6 +140,7 @@ class neutron::agents::ml2::ovn (
neutron_agent_ovn {
'DEFAULT/debug': value => $debug;
'DEFAULT/state_path': value => $state_path;
'agent/extensions': value => join(any2array($extensions), ',');
'agent/root_helper': value => $root_helper;
'agent/root_helper_daemon': value => $root_helper_daemon;
'ovs/ovsdb_connection': value => $ovsdb_connection;

4
releasenotes/notes/ovn-agent-extensions-cee9f88173a4c123.yaml Normal file
View File

@ -0,0 +1,4 @@
---
features:
- |
The new ``neutron::agents::ml2::ovn::extensions`` parameter has been added.

1
spec/classes/neutron_agents_ml2_ovn_spec.rb
View File

@ -38,6 +38,7 @@ describe 'neutron::agents::ml2::ovn' do
it 'configures ovn_agent.ini' do
should contain_neutron_agent_ovn('DEFAULT/debug').with(:value => '<SERVICE DEFAULT>')
should contain_neutron_agent_ovn('DEFAULT/state_path').with(:value => '/var/lib/neutron')
should contain_neutron_agent_ovn('agent/extensions').with(:value => '<SERVICE DEFAULT>')
should contain_neutron_agent_ovn('agent/root_helper').with(:value => 'sudo neutron-rootwrap /etc/neutron/rootwrap.conf')
should contain_neutron_agent_ovn('agent/root_helper_daemon').with(:value => '<SERVICE DEFAULT>')
should contain_neutron_agent_ovn('ovs/ovsdb_connection').with(:value => 'tcp:127.0.0.1:6640')