Merge "Migrate neutron-dynamic-routing from Ryu to os-ken"

This commit is contained in:
Zuul 2018-12-28 13:15:58 +00:00 committed by Gerrit Code Review
commit b8a49d3e08
2 changed files with 3 additions and 3 deletions

View File

@ -35,7 +35,7 @@
# #
# [*bgp_speaker_driver*] # [*bgp_speaker_driver*]
# (Optional) The BGP speaker driver to use. # (Optional) The BGP speaker driver to use.
# Defaults to 'neutron_dynamic_routing.services.bgp.agent.driver.ryu.driver.RyuBgpDriver' # Defaults to 'neutron_dynamic_routing.services.bgp.agent.driver.os_ken.driver.OsKenBgpDriver'
# #
# [*bgp_router_id*] # [*bgp_router_id*]
# (Optional) The BGP router ID. # (Optional) The BGP router ID.
@ -49,7 +49,7 @@ class neutron::agents::bgp_dragent(
$package_ensure = 'present', $package_ensure = 'present',
$enabled = true, $enabled = true,
$manage_service = true, $manage_service = true,
$bgp_speaker_driver = 'neutron_dynamic_routing.services.bgp.agent.driver.ryu.driver.RyuBgpDriver', $bgp_speaker_driver = 'neutron_dynamic_routing.services.bgp.agent.driver.os_ken.driver.OsKenBgpDriver',
$bgp_router_id = $::ipaddress, $bgp_router_id = $::ipaddress,
$purge_config = false, $purge_config = false,
) { ) {

View File

@ -22,7 +22,7 @@ describe 'neutron::agents::bgp_dragent' do
:package_ensure => 'present', :package_ensure => 'present',
:enabled => true, :enabled => true,
:manage_service => true, :manage_service => true,
:bgp_speaker_driver => 'neutron_dynamic_routing.services.bgp.agent.driver.ryu.driver.RyuBgpDriver', :bgp_speaker_driver => 'neutron_dynamic_routing.services.bgp.agent.driver.os_ken.driver.OsKenBgpDriver',
:purge_config => false, :purge_config => false,
} }
end end