openstack
/
puppet-neutron
Code Issues Proposed changes

Deprecate parameters for XenAPI support 

... because it was already deprecated in neutron[1].

[1] a6dbf97242caa3be646e8eb6b1502b5e59e123fd

Change-Id: I90a205df7817a28574e494ec7e1d497ee320a493
This commit is contained in:
Takashi Kajinami 2021-01-03 21:09:23 +09:00
parent 2314c53abf
commit 1e01fb86bc
3 changed files with 30 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
manifests/rootwrap.pp
View File

@ -4,33 +4,42 @@
#
# === Parameters:
#
# DEPRECATED PARAMETERS
#
# [*xenapi_connection_url*]
# (optional) XenAPI connection URL. Only needed when target a XenServer/XCP
# compute host's dom0
# Defaults to $::os_service_default.
# Defaults to undef.
#
# [*xenapi_connection_username*]
# (optional) XenAPI username. Only needed when target a XenServer/XCP
# compute host's dom0
# Defaults to $::os_service_default.
# Defaults to undef.
#
# [*xenapi_connection_password*]
# (optional) XenAPI connection password. Only needed when target a XenServer/XCP
# compute host's dom0
# Defaults to $::os_service_default.
# Defaults to undef.
#
class neutron::rootwrap (
$xenapi_connection_url = $::os_service_default,
$xenapi_connection_username = $::os_service_default,
$xenapi_connection_password = $::os_service_default,
# DEPRECATED PARAMETERS
$xenapi_connection_url = undef,
$xenapi_connection_username = undef,
$xenapi_connection_password = undef,
) {
include neutron::deps
neutron_rootwrap_config {
'xenapi/xenapi_connection_url': value => $xenapi_connection_url;
'xenapi/xenapi_connection_username': value => $xenapi_connection_username;
'xenapi/xenapi_connection_password': value => $xenapi_connection_password;
$deprecated_xenapi_param_names = [
'xenapi_connection_url',
'xenapi_connection_username',
'xenapi_connection_password',
]
$deprecated_xenapi_param_names.each |$param_name| {
$param = getvar($param_name)
if $param != undef {
warning("The ${param_name} parameter is deprecated and has no effect.")
}
}
}

9
releasenotes/notes/deprecate-xenapi-d97bb062fe508fbc.yaml Normal file
View File

@ -0,0 +1,9 @@
---
deprecations:
- |
The following parameters of the ``neutron::rootwrap`` class have been
deprecated and have no effect.
- ``xenapi_connection_url``
- ``xenapi_connection_username``
- ``xenapi_connection_password``

15
spec/classes/neutron_rootwrap_spec.rb
View File

@ -1,25 +1,14 @@
require 'spec_helper'
describe 'neutron::rootwrap' do
let :pre_condition do
"class { 'neutron::agents::ml2::ovs': }"
end
let :params do
{ :xenapi_connection_url => 'http://127.0.0.1',
:xenapi_connection_username => 'user',
:xenapi_connection_password => 'passw0rd',
}
{}
end
shared_examples 'neutron rootwrap' do
it 'configures rootwrap.conf' do
should contain_neutron_rootwrap_config('xenapi/xenapi_connection_url').with_value(params[:xenapi_connection_url]);
should contain_neutron_rootwrap_config('xenapi/xenapi_connection_username').with_value(params[:xenapi_connection_username]);
should contain_neutron_rootwrap_config('xenapi/xenapi_connection_password').with_value(params[:xenapi_connection_password]);
# Now this class doesn't have any effective parameters
end
end
on_supported_os({