openstack
/
puppet-neutron
Code Issues Proposed changes

Merge "networking-bagpipe: define package name & service"

This commit is contained in:
Zuul 2024-03-15 15:29:10 +00:00 committed by Gerrit Code Review
parent ba9fbc4e82 38e5f4cce2
commit f04250ecf4
4 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/agents/bagpipe.pp
View File

@ -98,8 +98,8 @@ class neutron::agents::bagpipe (
include neutron::deps
include neutron::params
if $facts['os']['family'] != 'RedHat' {
fail('BaGPipe agent is currently supported in RedHat OS family')
if ! $::neutron::params::bagpipe_bgp_package {
fail('BaGPipe agent is currently unsupported in this operating system.')
}
resources { 'neutron_bgpvpn_bagpipe_config':

6
manifests/params.pp
View File

@ -80,6 +80,8 @@ class neutron::params {
$api_service_name = 'neutron-api'
$rpc_package_name = 'neutron-rpc-server'
$rpc_service_name = 'neutron-rpc-server'
$bagpipe_bgp_package = 'networking-bagpipe-bgp-agent'
$bagpipe_bgp_service = 'networking-bagpipe-bgp-agent'
} else {
$ml2_server_package = 'neutron-plugin-ml2'
$server_service = 'neutron-server'
@ -88,11 +90,11 @@ class neutron::params {
$api_service_name = undef
$rpc_package_name = undef
$rpc_service_name = undef
$bagpipe_bgp_package = undef
$bagpipe_bgp_service = undef
}
$dynamic_routing_package = 'python3-neutron-dynamic-routing'
$bgp_dragent_package = 'neutron-bgp-dragent'
$bagpipe_bgp_package = undef
$bagpipe_bgp_service = undef
$bgpvpn_bagpipe_package = 'python3-networking-bagpipe'
$ovs_agent_package = 'neutron-openvswitch-agent'
$ovs_cleanup_service = undef

7
releasenotes/notes/bagpipe-agent-debian-support-0e6eb3c42f7809a2.yaml Normal file
View File

@ -0,0 +1,7 @@
---
features:
- |
Added support for networking-bagpie agent under Debian. Previously, only
Red Hat OS familly was supported, as Debian was not providing an agent
package. Note that Ubuntu still does not provide a bagpipe agent package
or service, and therefore, is still unsuported.

5
spec/classes/neutron_agents_bagpipe_spec.rb
View File

@ -118,11 +118,12 @@ describe 'neutron::agents::bagpipe' do
{ :bagpipe_bgp_package => 'openstack-bagpipe-bgp',
:bagpipe_bgp_service => 'bagpipe-bgp' }
when 'Debian'
{}
{ :bagpipe_bgp_package => 'networking-bagpipe-bgp-agent',
:bagpipe_bgp_service => 'networking-bagpipe-bgp-agent' }
end
end
if facts[:os]['family'] == 'RedHat'
if facts[:os]['family'] == 'RedHat' or facts[:os]['name'] == 'Debian'
it_behaves_like 'neutron bgpvpn bagpipe agent'
end
end