openstack/puppet-nova
Code Issues Proposed changes

Merge "Remove deprecated max_concurrent_builds from nova::compute::ironic"

Browse Source
This commit is contained in:
Zuul
2021-08-24 09:30:36 +00:00
committed by Gerrit Code Review
parent a6e8c7f541 0cba8bc924
commit f57463ca68
3 changed files with 6 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/compute.pp
View File

@@ -371,10 +371,6 @@ class nova::compute (
$image_type_exclude_list_real = pick(join(any2array($image_type_exclude_list), ','), $::os_service_default) $image_type_exclude_list_real = pick(join(any2array($image_type_exclude_list), ','), $::os_service_default)
$max_concurrent_builds_real = pick(
$::nova::compute::ironic::max_concurrent_builds,
$max_concurrent_builds)
include nova::pci include nova::pci
if $pci_passthrough { if $pci_passthrough {
# Note: also remove the pick from nova::compute::pci # Note: also remove the pick from nova::compute::pci
@@ -496,7 +492,7 @@ Use the same parameter in nova::api class.')
'DEFAULT/resize_confirm_window': value => $resize_confirm_window; 'DEFAULT/resize_confirm_window': value => $resize_confirm_window;
'DEFAULT/shutdown_timeout': value => $shutdown_timeout; 'DEFAULT/shutdown_timeout': value => $shutdown_timeout;
'DEFAULT/resume_guests_state_on_host_boot': value => $resume_guests_state_on_host_boot; 'DEFAULT/resume_guests_state_on_host_boot': value => $resume_guests_state_on_host_boot;
'DEFAULT/max_concurrent_builds': value => $max_concurrent_builds_real; 'DEFAULT/max_concurrent_builds': value => $max_concurrent_builds;
'DEFAULT/max_concurrent_live_migrations': value => $max_concurrent_live_migrations; 'DEFAULT/max_concurrent_live_migrations': value => $max_concurrent_live_migrations;
'DEFAULT/sync_power_state_pool_size': value => $sync_power_state_pool_size; 'DEFAULT/sync_power_state_pool_size': value => $sync_power_state_pool_size;
'DEFAULT/sync_power_state_interval': value => $sync_power_state_interval; 'DEFAULT/sync_power_state_interval': value => $sync_power_state_interval;

12
manifests/compute/ironic.pp
View File

@@ -8,14 +8,8 @@
# (optional) Compute driver. # (optional) Compute driver.
# Defaults to 'ironic.IronicDriver' # Defaults to 'ironic.IronicDriver'
# #
# [*max_concurrent_builds*]
# (optional) Maximum number of instance builds to run concurrently
# Defaults to undef
#
class nova::compute::ironic ( class nova::compute::ironic (
$compute_driver = 'ironic.IronicDriver', $compute_driver = 'ironic.IronicDriver',
# DEPRECATED PARAMETERS
$max_concurrent_builds = undef,
) { ) {
include nova::deps include nova::deps
@@ -25,10 +19,4 @@ class nova::compute::ironic (
nova_config { nova_config {
'DEFAULT/compute_driver': value => $compute_driver; 'DEFAULT/compute_driver': value => $compute_driver;
} }
if $max_concurrent_builds != undef {
warning('The nova::compute::ironic::max_concurrent_builds parameter is deprecated \
and will be removed in a future release. Use nova::compute::max_concurrent_builds instead.')
}
} }

5
releasenotes/notes/remove-ironic-max_concurrent_builds-c1ca15bb24bba255.yaml Normal file
View File

@@ -0,0 +1,5 @@
---
upgrade:
- |
The ``nova::compute::ironic::max_concurrent_builds`` parameter has been
removed.