openstack/puppet-neutron
Code Issues Proposed changes

Contrail: Deprecate ineffective multi_tenancy parameter

Browse Source 
The [APISERVER] multi_tenancy parameter was already removed[1].

[1] https://github.com/Juniper/contrail-neutron-plugin/commit/4e91f804

Change-Id: I4b0e7202623282f33c17fb50cfd74fac3592367a
This commit is contained in:
Takashi Kajinami
2022-04-10 19:21:19 +09:00
parent 0c34071fe9
commit 766570bd5a
3 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
manifests/plugins/opencontrail.pp
View File

@@ -10,10 +10,6 @@
# (Optional) Port of the API Server.
# Defaults to $::os_service_default
#
# [*multi_tenancy*]
# (Optional) Whether to enable multi-tenancy
# Default to $::os_service_default
#
# [*contrail_extensions*]
# (Optional) Array of OpenContrail extensions to be supported
# Defaults to $::os_service_default
@@ -62,10 +58,13 @@
# Admin token
# Defaults to undef
#
# [*multi_tenancy*]
# (Optional) Whether to enable multi-tenancy
# Default to undef
#
class neutron::plugins::opencontrail (
$api_server_ip = $::os_service_default,
$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,
@@ -77,6 +76,7 @@ class neutron::plugins::opencontrail (
$keystone_admin_tenant_name = undef,
$keystone_admin_password = undef,
$keystone_admin_token = undef,
$multi_tenancy = undef,
) {
include neutron::deps
@@ -94,6 +94,10 @@ class neutron::plugins::opencontrail (
}
}
if $multi_tenancy != undef {
warning('The multi_tenancy parameter is deprecated and has no effect.')
}
validate_legacy(Array, 'validate_array', $contrail_extensions)
package { 'neutron-plugin-contrail':
@@ -134,7 +138,6 @@ class neutron::plugins::opencontrail (
neutron_plugin_opencontrail {
'APISERVER/api_server_ip': value => $api_server_ip;
'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;
@@ -146,6 +149,7 @@ class neutron::plugins::opencontrail (
'KEYSTONE/admin_tenant_name': ensure => absent;
'KEYSTONE/admin_password': ensure => absent;
'KEYSTONE/admin_token': ensure => absent;
'APISERVER/multi_tenancy': ensure => absent;
}
}

5
releasenotes/notes/deprecate-contrail-multi_tenancy-c6de173a64ea8383.yaml Normal file
View File

@@ -0,0 +1,5 @@
---
deprecations:
- |
The ``neutron::plugins::opencontrail::multi_tenancy`` parmaeter has been
deprecated and has no effect.

2
spec/classes/neutron_plugins_opencontrail_spec.rb
View File

@@ -6,7 +6,6 @@ describe 'neutron::plugins::opencontrail' do
{
:api_server_ip => '10.0.0.1',
:api_server_port => '8082',
:multi_tenancy => 'true',
:contrail_extensions => ['ipam:ipam','policy:policy','route-table'],
:purge_config => false,
}
@@ -21,7 +20,6 @@ describe 'neutron::plugins::opencontrail' do
it 'should perform default configuration of' do
should contain_neutron_plugin_opencontrail('APISERVER/api_server_ip').with_value(params[:api_server_ip])
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>')