openstack/puppet-nova
Code Issues Proposed changes

Remove some useless parameters in xenserver.pp

Browse Source 
Some parameters are useless in xenserver.pp,
have no effect and will be removed in the future.

Change-Id: Ib967488ec64201ff7464174795b40ef105f7dac3
This commit is contained in:
zhangyangyang 2017-09-30 22:27:19 +08:00
parent c60b1b3534
commit afc4b27380
2 changed files with 5 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
manifests/compute/xenserver.pp
View File

@ -223,23 +223,6 @@
# first introduced (integer value)
# Defaults to $::os_service_default
#
# DEPRECATED PARAMETERS
#
# [*xenapi_inject_image*]
# (optional) DEPRECATED: This parameter does nothing.
#
# [*xenapi_connection_url*]
# (optional) DEPRECATED: URL for connection to XenServer/Xen Cloud Platform.
# Please use connection_url parameter.
#
# [*xenapi_connection_username*]
# (optional) DEPRECATED: Username for connection to XenServer/Xen Cloud Platform
# Please use connection_username parameter.
#
# [*xenapi_connection_password*]
# (optional) DEPRECATED: Password for connection to XenServer/Xen Cloud Platform.
# Please use connection_password parameter.
#
class nova::compute::xenserver(
$connection_url,
$connection_username,
@ -288,32 +271,10 @@ class nova::compute::xenserver(
$vif_driver = 'nova.virt.xenapi.vif.XenAPIOpenVswitchDriver',
$image_upload_handler = $::os_service_default,
$introduce_vdi_retry_wait = $::os_service_default,
# DEPRECATED PARAMETERS
$xenapi_inject_image = undef,
$xenapi_connection_url = undef,
$xenapi_connection_username = undef,
$xenapi_connection_password = undef,
) {
include ::nova::deps
if $xenapi_inject_image != undef {
warning('The xenapi_inject_image parameter is deprecated and has no effect.')
}
if $xenapi_connection_url {
warning('The xenapi_connection_url parameter is deprecated and has no effect, please use connection_url.')
}
if $xenapi_connection_username {
warning('The xenapi_connection_username parameter is deprecated and has no effect, please use connection_username.')
}
if $xenapi_connection_password {
warning('The xenapi_connection_password parameter is deprecated and has no effect, please use connection_password.')
}
nova_config {
'DEFAULT/compute_driver': value => $compute_driver;
'xenserver/connection_url': value => $connection_url;

5
releasenotes/notes/remove_useless_parameter-cfb0bc82dd6693e9.yaml Normal file
View File

@ -0,0 +1,5 @@
---
upgrade:
- Remove some useless parameters
Some parameters are useless in xenserver.pp,
have no effect and will be removed in the future.