networking-bagpipe: define package name & service
Add the package name and service name for Debian for the Bagpipe plugin. These were previously undefined. Also do the unit testing under Debian. Change-Id: Ia4baa6a351b44b4a501a57f3a9c8d11364e2ccb0
This commit is contained in:

committed by
Takashi Kajinami

parent
dbb441329f
commit
38e5f4cce2
@@ -98,8 +98,8 @@ class neutron::agents::bagpipe (
|
|||||||
include neutron::deps
|
include neutron::deps
|
||||||
include neutron::params
|
include neutron::params
|
||||||
|
|
||||||
if $facts['os']['family'] != 'RedHat' {
|
if ! $::neutron::params::bagpipe_bgp_package {
|
||||||
fail('BaGPipe agent is currently supported in RedHat OS family')
|
fail('BaGPipe agent is currently unsupported in this operating system.')
|
||||||
}
|
}
|
||||||
|
|
||||||
resources { 'neutron_bgpvpn_bagpipe_config':
|
resources { 'neutron_bgpvpn_bagpipe_config':
|
||||||
|
@@ -80,6 +80,8 @@ class neutron::params {
|
|||||||
$api_service_name = 'neutron-api'
|
$api_service_name = 'neutron-api'
|
||||||
$rpc_package_name = 'neutron-rpc-server'
|
$rpc_package_name = 'neutron-rpc-server'
|
||||||
$rpc_service_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 {
|
} else {
|
||||||
$ml2_server_package = 'neutron-plugin-ml2'
|
$ml2_server_package = 'neutron-plugin-ml2'
|
||||||
$server_service = 'neutron-server'
|
$server_service = 'neutron-server'
|
||||||
@@ -88,11 +90,11 @@ class neutron::params {
|
|||||||
$api_service_name = undef
|
$api_service_name = undef
|
||||||
$rpc_package_name = undef
|
$rpc_package_name = undef
|
||||||
$rpc_service_name = undef
|
$rpc_service_name = undef
|
||||||
|
$bagpipe_bgp_package = undef
|
||||||
|
$bagpipe_bgp_service = undef
|
||||||
}
|
}
|
||||||
$dynamic_routing_package = 'python3-neutron-dynamic-routing'
|
$dynamic_routing_package = 'python3-neutron-dynamic-routing'
|
||||||
$bgp_dragent_package = 'neutron-bgp-dragent'
|
$bgp_dragent_package = 'neutron-bgp-dragent'
|
||||||
$bagpipe_bgp_package = undef
|
|
||||||
$bagpipe_bgp_service = undef
|
|
||||||
$bgpvpn_bagpipe_package = 'python3-networking-bagpipe'
|
$bgpvpn_bagpipe_package = 'python3-networking-bagpipe'
|
||||||
$ovs_agent_package = 'neutron-openvswitch-agent'
|
$ovs_agent_package = 'neutron-openvswitch-agent'
|
||||||
$ovs_cleanup_service = undef
|
$ovs_cleanup_service = undef
|
||||||
|
@@ -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.
|
@@ -118,11 +118,12 @@ describe 'neutron::agents::bagpipe' do
|
|||||||
{ :bagpipe_bgp_package => 'openstack-bagpipe-bgp',
|
{ :bagpipe_bgp_package => 'openstack-bagpipe-bgp',
|
||||||
:bagpipe_bgp_service => 'bagpipe-bgp' }
|
:bagpipe_bgp_service => 'bagpipe-bgp' }
|
||||||
when 'Debian'
|
when 'Debian'
|
||||||
{}
|
{ :bagpipe_bgp_package => 'networking-bagpipe-bgp-agent',
|
||||||
|
:bagpipe_bgp_service => 'networking-bagpipe-bgp-agent' }
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
if facts[:os]['family'] == 'RedHat'
|
if facts[:os]['family'] == 'RedHat' or facts[:os]['name'] == 'Debian'
|
||||||
it_behaves_like 'neutron bgpvpn bagpipe agent'
|
it_behaves_like 'neutron bgpvpn bagpipe agent'
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
Reference in New Issue
Block a user