openstack/puppet-neutron
Code Issues Proposed changes

Contrail: Support timeout parameters

Browse Source 
Change-Id: Id5fabbdd38d03835d6b3fc750c108123fd719e6d
This commit is contained in:
Takashi Kajinami 2022-04-10 19:13:42 +09:00
parent 38f1a2e250
commit 0c34071fe9
3 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manifests/plugins/opencontrail.pp
View File

@ -23,6 +23,14 @@
# contrail_extensions => ['ipam:neutron_plugin_contrail.plugins.opencontrail.contrail_plugin_ipam.NeutronPluginContrailIpam']
# }
#
# [*timeout*]
# (Optional) VNC API Server request timeout in seconds.
# Defaults to $::os_service_default
#
# [*connection_timeout*]
# (Optional) VNC API Server connection timeout in seconds.
# Defaults to $::os_service_default
#
# [*package_ensure*]
# (Optional) Ensure state for package.
# Defaults to 'present'.
@ -59,6 +67,8 @@ class neutron::plugins::opencontrail (
$api_server_port = $::os_service_default,
$multi_tenancy = $::os_service_default,
$contrail_extensions = $::os_service_default,
$timeout = $::os_service_default,
$connection_timeout = $::os_service_default,
$package_ensure = 'present',
$purge_config = false,
# DEPRECATED PARAMETERS
@ -126,6 +136,8 @@ class neutron::plugins::opencontrail (
'APISERVER/api_server_port': value => $api_server_port;
'APISERVER/multi_tenancy': value => $multi_tenancy;
'APISERVER/contrail_extensions': value => join($contrail_extensions, ',');
'APISERVER/timeout': value => $timeout;
'APISERVER/connection_timeout': value => $connection_timeout;
}
neutron_plugin_opencontrail {

5
releasenotes/notes/contrail-timeout-c4a123c13872f4c6.yaml Normal file
View File

@ -0,0 +1,5 @@
---
features:
- |
The ``neutron::plugins::contrail`` class now support the ``timeout``
parameter and the ``connection_timeout`` parameter.

6
spec/classes/neutron_plugins_opencontrail_spec.rb
View File

@ -1,7 +1,7 @@
require 'spec_helper'
describe 'neutron::plugins::opencontrail' do
shared_examples 'neutron::opencontrail::plugin' do
shared_examples 'neutron::plugins::contrail' do
let :params do
{
:api_server_ip => '10.0.0.1',
@ -23,6 +23,8 @@ describe 'neutron::plugins::opencontrail' do
should contain_neutron_plugin_opencontrail('APISERVER/api_server_port').with_value(params[:api_server_port])
should contain_neutron_plugin_opencontrail('APISERVER/multi_tenancy').with_value(params[:multi_tenancy])
should contain_neutron_plugin_opencontrail('APISERVER/contrail_extensions').with_value(params[:contrail_extensions].join(','))
should contain_neutron_plugin_opencontrail('APISERVER/timeout').with_value('<SERVICE DEFAULT>')
should contain_neutron_plugin_opencontrail('APISERVER/connection_timeout').with_value('<SERVICE DEFAULT>')
end
end
@ -69,7 +71,7 @@ describe 'neutron::plugins::opencontrail' do
facts.merge!(OSDefaults.get_facts())
end
it_behaves_like 'neutron::opencontrail::plugin'
it_behaves_like 'neutron::plugins::contrail'
it_behaves_like "neutron::plugins::opencontrail on #{facts[:osfamily]}"
end
end