conductor: Remove configdrive_use_swift

... because it was deprecated during Victoria cycle[1] in favor of
the configdriver_use_object_store parameter.

[1] 73d39c09c1

Change-Id: I31f995aa13931bbcd400e7806dcfe583a9244141
This commit is contained in:
Takashi Kajinami 2022-06-19 22:25:06 +09:00
parent 818b8ce831
commit 37b2d997a8
2 changed files with 6 additions and 15 deletions

View File

@ -195,11 +195,6 @@
#
# DEPRECATED PARAMETERS
#
# [*configdrive_use_swift*]
# (optional) Whether to use Swift for storing config drives instead of
# the database. Recommended for bigger config drives.
# Defaults to undef
#
# [*inspect_timeout*]
# (optional) Timeout (seconds) for waiting for node inspection.
# 0 for unlimited.
@ -265,7 +260,6 @@ class ironic::conductor (
$allow_provisioning_in_maintenance = $::os_service_default,
$image_download_concurrency = $::os_service_default,
# DEPRECATED PARAMETERS
$configdrive_use_swift = undef,
$inspect_timeout = undef,
$cleaning_network_name = undef,
$provisioning_network_name = undef,
@ -279,14 +273,6 @@ class ironic::conductor (
# For backward compatibility
include ironic::glance
if $configdrive_use_swift != undef {
warning('configdrive_use_swift is deprecated and will be removed \
in a future release. Use configdrive_use_object_store instead')
$configdrive_use_object_store_real = $configdrive_use_swift
} else {
$configdrive_use_object_store_real = $configdrive_use_object_store
}
if $inspect_timeout != undef {
warning('inspect_timeout is deprecated and will be removed in a future release. \
Use inspect_wait_timeout instead')
@ -350,7 +336,7 @@ Use inspect_wait_timeout instead')
'deploy/erase_devices_priority': value => $erase_devices_priority;
'deploy/erase_devices_metadata_priority': value => $erase_devices_metadata_priority;
'deploy/continue_if_disk_secure_erase_fails': value => $continue_if_disk_secure_erase_fails;
'deploy/configdrive_use_object_store': value => $configdrive_use_object_store_real;
'deploy/configdrive_use_object_store': value => $configdrive_use_object_store;
'conductor/configdrive_swift_container': value => $configdrive_swift_container;
'conductor/inspect_wait_timeout': value => $inspect_wait_timeout_real;
'deploy/default_boot_option': value => $default_boot_option;

View File

@ -0,0 +1,5 @@
---
upgrade:
- |
The ``ironic::conductor::configdrive_use_swift`` parameter has been
removed.