openstack/puppet-neutron
Code Issues Proposed changes

bagpipe: Add support for [api] host

Browse Source 
... so that both host and port can be configured.

Change-Id: I66014eb2ac61a79fe9ceba6761c685c66b841d01
This commit is contained in:
Takashi Kajinami
2022-06-20 08:31:22 +09:00
parent 6c17877a0e
commit baa0b6e4bc
3 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/agents/bagpipe.pp
View File

@@ -25,8 +25,12 @@
# (required) Private Autonomous System number # (required) Private Autonomous System number
# Defaults to $::os_service_default # Defaults to $::os_service_default
# #
# [*api_host*]
# (optional) BGP component API host
# Defaults to $::os_service_default
#
# [*api_port*] # [*api_port*]
# BGP component API port # (optional) BGP component API port
# Defaults to $::os_service_default # Defaults to $::os_service_default
# #
# [*dataplane_driver_ipvpn*] # [*dataplane_driver_ipvpn*]
@@ -76,6 +80,7 @@
# #
class neutron::agents::bagpipe ( class neutron::agents::bagpipe (
$my_as, $my_as,
$api_host = $::os_service_default,
$api_port = $::os_service_default, $api_port = $::os_service_default,
$dataplane_driver_ipvpn = 'ovs', $dataplane_driver_ipvpn = 'ovs',
$enabled = true, $enabled = true,
@@ -98,6 +103,7 @@ class neutron::agents::bagpipe (
} }
neutron_bgpvpn_bagpipe_config { neutron_bgpvpn_bagpipe_config {
'api/host': value => $api_host;
'api/port': value => $api_port; 'api/port': value => $api_port;
'bgp/local_address': value => $local_address; 'bgp/local_address': value => $local_address;
'bgp/peers': value => join(any2array($peers), ','); 'bgp/peers': value => join(any2array($peers), ',');

4
releasenotes/notes/bagpipe-api_host-f337e4b43fac3660.yaml Normal file
View File

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

2
spec/classes/neutron_agents_bagpipe_spec.rb
View File

@@ -21,6 +21,7 @@ describe 'neutron::agents::bagpipe' do
let :params do let :params do
{ {
:my_as => 64512, :my_as => 64512,
:api_host => '192.168.0.100',
:api_port => 8082, :api_port => 8082,
:dataplane_driver_ipvpn => 'ovs', :dataplane_driver_ipvpn => 'ovs',
:enabled => true, :enabled => true,
@@ -58,6 +59,7 @@ describe 'neutron::agents::bagpipe' do
end end
it 'configures bgp.conf' do it 'configures bgp.conf' do
should contain_neutron_bgpvpn_bagpipe_config('api/host').with_value(p[:api_host])
should contain_neutron_bgpvpn_bagpipe_config('api/port').with_value(p[:api_port]) should contain_neutron_bgpvpn_bagpipe_config('api/port').with_value(p[:api_port])
should contain_neutron_bgpvpn_bagpipe_config('bgp/local_address').with_value(p[:local_address]) should contain_neutron_bgpvpn_bagpipe_config('bgp/local_address').with_value(p[:local_address])
should contain_neutron_bgpvpn_bagpipe_config('bgp/peers').with_value(p[:peers]) should contain_neutron_bgpvpn_bagpipe_config('bgp/peers').with_value(p[:peers])