openstack/puppet-neutron
Code Issues Proposed changes

Merge "Ubuntu: Add ovn-maintenance-worker support"

Browse Source
This commit is contained in:
Zuul
2025-06-30 16:38:23 +00:00
committed by Gerrit Code Review
parent ee4bf182bb d516b0751e
commit a2330efca8
3 changed files with 34 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
manifests/params.pp
View File

@@ -5,22 +5,23 @@
class neutron::params {
include openstacklib::defaults
$client_package = 'python3-neutronclient'
$ovs_agent_service = 'neutron-openvswitch-agent'
$macvtap_agent_service = 'neutron-macvtap-agent'
$dhcp_agent_service = 'neutron-dhcp-agent'
$metering_agent_service = 'neutron-metering-agent'
$l3_agent_service = 'neutron-l3-agent'
$metadata_agent_service = 'neutron-metadata-agent'
$ovn_metadata_agent_service = 'neutron-ovn-metadata-agent'
$ovn_agent_service = 'neutron-ovn-agent'
$bgp_dragent_service = 'neutron-bgp-dragent'
$bgpvpn_plugin_package = 'python3-networking-bgpvpn'
$l2gw_agent_service = 'neutron-l2gw-agent'
$sfc_package = 'python3-networking-sfc'
$user = 'neutron'
$group = 'neutron'
$arista_plugin_package = 'python3-networking-arista'
$client_package = 'python3-neutronclient'
$ovs_agent_service = 'neutron-openvswitch-agent'
$macvtap_agent_service = 'neutron-macvtap-agent'
$dhcp_agent_service = 'neutron-dhcp-agent'
$metering_agent_service = 'neutron-metering-agent'
$l3_agent_service = 'neutron-l3-agent'
$metadata_agent_service = 'neutron-metadata-agent'
$ovn_metadata_agent_service = 'neutron-ovn-metadata-agent'
$ovn_agent_service = 'neutron-ovn-agent'
$ovn_maintenance_worker_service = 'neutron-ovn-maintenance-worker'
$bgp_dragent_service = 'neutron-bgp-dragent'
$bgpvpn_plugin_package = 'python3-networking-bgpvpn'
$l2gw_agent_service = 'neutron-l2gw-agent'
$sfc_package = 'python3-networking-sfc'
$user = 'neutron'
$group = 'neutron'
$arista_plugin_package = 'python3-networking-arista'
case $facts['os']['family'] {
'RedHat': {
@@ -53,7 +54,6 @@ class neutron::params {
$ovn_metadata_agent_package = 'openstack-neutron-ovn-metadata-agent'
$ovn_agent_package = 'openstack-neutron-ovn-agent'
$ovn_maintenance_worker_package = 'openstack-neutron-ovn-maintenance-worker'
$ovn_maintenance_worker_service = 'neutron-ovn-maintenance-worker'
$dynamic_routing_package = 'python3-neutron-dynamic-routing'
$bgp_dragent_package = 'openstack-neutron-bgp-dragent'
$bagpipe_bgp_package = 'openstack-bagpipe-bgp'
@@ -117,8 +117,7 @@ class neutron::params {
$l2gw_package = 'python3-networking-l2gw'
$ovn_metadata_agent_package = 'neutron-ovn-metadata-agent'
$ovn_agent_package = 'neutron-ovn-agent'
$ovn_maintenance_worker_package = undef
$ovn_maintenance_worker_service = undef
$ovn_maintenance_worker_package = 'neutron-ovn-maintenance-worker'
$neutron_wsgi_script_path = '/usr/lib/cgi-bin/neutron'
$neutron_wsgi_script_source = '/usr/bin/neutron-api'
$networking_baremetal_package = 'python3-ironic-neutron-agent'

32
manifests/plugins/ml2/ovn/maintenance_worker.pp
View File

@@ -22,29 +22,23 @@ class neutron::plugins::ml2::ovn::maintenance_worker (
include neutron::params
if $::neutron::params::ovn_maintenance_worker_package {
package { 'neutron-ovn-maintenance-worker':
ensure => $package_ensure,
name => $::neutron::params::ovn_maintenance_worker_package,
tag => ['openstack', 'neutron-package'],
}
package { 'neutron-ovn-maintenance-worker':
ensure => $package_ensure,
name => $::neutron::params::ovn_maintenance_worker_package,
tag => ['openstack', 'neutron-package'],
}
if $manage_service {
if $::neutron::params::ovn_maintenance_worker_service {
if $enabled {
$service_ensure = 'running'
} else {
$service_ensure = 'stopped'
}
service { 'neutron-ovn-maintenance-worker':
ensure => $service_ensure,
name => $::neutron::params::ovn_maintenance_worker_service,
enable => $enabled,
tag => 'neutron-service',
}
if $enabled {
$service_ensure = 'running'
} else {
warning('neutron-ovn-maintenance-worker service is not available.')
$service_ensure = 'stopped'
}
service { 'neutron-ovn-maintenance-worker':
ensure => $service_ensure,
name => $::neutron::params::ovn_maintenance_worker_service,
enable => $enabled,
tag => 'neutron-service',
}
}
}

7
spec/classes/neutron_plugins_ml2_ovn_maintenance_worker_spec.rb
View File

@@ -44,16 +44,15 @@ describe 'neutron::plugins::ml2::ovn::maintenance_worker' do
let (:platform_params) do
case facts[:os]['family']
when 'Debian'
{}
{ :ovn_maintenance_worker_package => 'neutron-ovn-maintenance-worker',
:ovn_maintenance_worker_service => 'neutron-ovn-maintenance-worker' }
when 'RedHat'
{ :ovn_maintenance_worker_package => 'openstack-neutron-ovn-maintenance-worker',
:ovn_maintenance_worker_service => 'neutron-ovn-maintenance-worker' }
end
end
if facts[:os]['family'] == 'RedHat'
it_behaves_like 'neutron::plugins::ml2::ovn::maintenance_worker'
end
it_behaves_like 'neutron::plugins::ml2::ovn::maintenance_worker'
end
end
end