Adds Neutron parameter max_allowed_address_pair

Adds a new Puppet parameter "max_allowed_address_pair" which goes into
the neutron.conf configuration file and allows to change that parameter
to any number (default is 10).

Change-Id: Id187696a28c9e721aa4a62a2208e9c8b8397f1ed
Closes-Bug: 1730367
This commit is contained in:
Lutz Birkhahn 2017-11-06 12:41:49 +01:00
parent 0a2b0141a8
commit 4caba09d29
3 changed files with 24 additions and 0 deletions

View File

@ -329,6 +329,10 @@
# transport://user:pass@host1:port[,hostN:portN]/virtual_host
# Defaults to $::os_service_default.
#
# [*max_allowed_address_pair*]
# (optional) Maximum number of allowed address pairs per port
# Defaults to $::os_service_default.
#
# DEPRECATED PARAMETERS
#
# [*rabbit_password*]
@ -422,6 +426,7 @@ class neutron (
$notification_driver = $::os_service_default,
$notification_topics = $::os_service_default,
$notification_transport_url = $::os_service_default,
$max_allowed_address_pair = $::os_service_default,
# DEPRECATED PARAMETERS
$rabbit_password = $::os_service_default,
$rabbit_host = $::os_service_default,
@ -501,6 +506,7 @@ instead.")
'DEFAULT/api_extensions_path': value => $api_extensions_path;
'DEFAULT/state_path': value => $state_path;
'DEFAULT/global_physnet_mtu': value => $global_physnet_mtu;
'DEFAULT/max_allowed_address_pair':value => $max_allowed_address_pair;
'agent/root_helper': value => $root_helper;
'agent/root_helper_daemon': value => $root_helper_daemon;
'agent/report_interval': value => $report_interval;

View File

@ -0,0 +1,5 @@
---
features:
- Add the Neutron configuration parameter "max_allowed_address_pair"
to Puppet so that more than the default 10 address pairs per port
can be used.

View File

@ -91,6 +91,7 @@ describe 'neutron' do
it_configures 'with dns_domain defined'
it_configures 'with transport_url defined'
it_configures 'with rootwrap daemon'
it_configures 'with max_allowed_address_pair defined'
context 'with amqp messaging' do
it_configures 'amqp support'
@ -520,6 +521,18 @@ describe 'neutron' do
end
end
shared_examples_for 'with max_allowed_address_pair defined' do
before do
params.merge!(
:max_allowed_address_pair => '50'
)
end
it do
is_expected.to contain_neutron_config('DEFAULT/max_allowed_address_pair').with_value(params[:max_allowed_address_pair])
end
end
context 'on Debian platforms' do
let :facts do
@default_facts.merge(test_facts.merge({