openstack/puppet-nova
Code Issues Proposed changes

Remove deprecated nova::block_device_* parameters

Browse Source 
These parameters were deprecated in favor of the new parameters added
to the nova::compute class during Wallaby cycle[1].

[1] 8c2f57b685

Change-Id: Ia19fbf656ec84420c2e505d53c5d79db6e5c2217
This commit is contained in:
Takashi Kajinami
2022-05-10 21:28:43 +09:00
parent 6556576575
commit 9b5c844089
3 changed files with 9 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
manifests/compute.pp
View File

@@ -436,13 +436,6 @@ class nova::compute (
include nova::availability_zone
$block_device_allocate_retries_real = pick(
$::nova::block_device_allocate_retries,
$block_device_allocate_retries)
$block_device_allocate_retries_interval_real = pick(
$::nova::block_device_allocate_retries_interval,
$block_device_allocate_retries_interval)
# NOTE(tkajinam): In some distros like CentOS9, the genisoimage command
# is no longer available and we should override
# the mkisofs_cmd parameter to use the available command
@@ -486,9 +479,9 @@ class nova::compute (
'DEFAULT/compute_monitors': value => join(any2array($compute_monitors), ',');
'DEFAULT/default_ephemeral_format': value => $default_ephemeral_format;
'compute/image_type_exclude_list': value => $image_type_exclude_list_real;
'DEFAULT/block_device_allocate_retries': value => $block_device_allocate_retries_real;
'DEFAULT/block_device_allocate_retries': value => $block_device_allocate_retries;
'DEFAULT/block_device_allocate_retries_interval':
value => $block_device_allocate_retries_interval_real;
value => $block_device_allocate_retries_interval;
}
if $keymgr_backend != undef {

21
manifests/init.pp
View File

@@ -380,15 +380,6 @@
# <service_type>:<service_name>:<endpoint_type>
# Defaults to undef
#
# [*block_device_allocate_retries*]
# (optional) Number of times to retry block device allocation on failures
# Defaults to undef.
#
# [*block_device_allocate_retries_interval*]
# (optional) Waiting time interval (seconds) between block device allocation
# retries on failures
# Defaults to undef.
#
# [*cross_az_attach*]
# (optional) Allow attach between instance and volume in different availability zones.
# Defaults to undef
@@ -473,8 +464,6 @@ class nova(
$auth_strategy = undef,
$os_region_name = undef,
$cinder_catalog_info = undef,
$block_device_allocate_retries = undef,
$block_device_allocate_retries_interval = undef,
$cross_az_attach = undef,
) inherits nova::params {
@@ -496,16 +485,6 @@ in a future release. Use nova::cinder::os_region_name instead')
in a future release. Use nova::cinder::catalog_info instead')
}
if $block_device_allocate_retries != undef {
warning('The block_device_allocate_retries parameter is deprecated. \
Use nova::compute::block_device_allocate_retries instead')
}
if $block_device_allocate_retries_interval != undef {
warning('The block_device_allocate_retries_interval parameter is deprecated. \
Use nova::compute::block_device_allocate_retries_interval instead')
}
if $cross_az_attach != undef {
warning('The cross_az_attach parameter is deprecated. \
Use nova::cinder::cross_az_attach instead.')

7
releasenotes/notes/remove-block-device-opts-from-base-c45cc254048f3392.yaml Normal file
View File

@@ -0,0 +1,7 @@
---
upgrade:
- |
The following parameters of the ``nova`` class have been removed.
- ``nova::block_device_allocate_retries``
- ``nova::block_device_allocate_retries_interval``