openstack/puppet-nova
Code Issues Proposed changes

Deprecate support for config_drive_format

Browse Source 
This option was already deprecated in nova[1].

[1] c19ecc34ea7fc19e5c4278eb4fda8b5cf7e9d638

Change-Id: I7df50dbf433a0f056ec406d749e6fd30051b645b
This commit is contained in:
Takashi Kajinami 2023-11-01 15:30:39 +09:00
parent 29378852ad
commit 640c9f1a1f
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
manifests/compute.pp
View File

@ -90,10 +90,6 @@
# The amount of disk in MB reserved for the host.
# Defaults to $facts['os_service_default']
#
# [*config_drive_format*]
# (optional) Config drive format. One of iso9660 (default) or vfat
# Defaults to undef
#
# [*update_resources_interval*]
# (optional) Interval for updating compute resources.
# This option specifies how often the update_available_resources periodic
@ -253,6 +249,12 @@
# retries on failures
# Defaults to $facts['os_service_default']
#
# DEPRECATED PARAMETERS
#
# [*config_drive_format*]
# (optional) Config drive format. One of iso9660 (default) or vfat
# Defaults to undef
#
class nova::compute (
Boolean $enabled = true,
Boolean $manage_service = true,
@ -274,7 +276,6 @@ class nova::compute (
$reserved_host_memory = $facts['os_service_default'],
$reserved_host_disk = $facts['os_service_default'],
$heal_instance_info_cache_interval = $facts['os_service_default'],
$config_drive_format = $facts['os_service_default'],
$update_resources_interval = $facts['os_service_default'],
$reboot_timeout = $facts['os_service_default'],
$instance_build_timeout = $facts['os_service_default'],
@ -303,11 +304,17 @@ class nova::compute (
$image_type_exclude_list = $facts['os_service_default'],
$block_device_allocate_retries = $facts['os_service_default'],
$block_device_allocate_retries_interval = $facts['os_service_default'],
# DEPRECATED PARAMETERS
$config_drive_format = undef,
) {
include nova::deps
include nova::params
if $config_drive_format != undef {
warning('The config_drive_format parameter is deprecated.')
}
$image_type_exclude_list_real = pick(join(any2array($image_type_exclude_list), ','), $facts['os_service_default'])
include nova::policy
@ -451,13 +458,14 @@ class nova::compute (
}
}
if is_service_default($config_drive_format) or $config_drive_format == 'iso9660' {
$config_drive_format_real = pick($config_drive_format, $facts['os_service_default'])
if is_service_default($config_drive_format_real) or $config_drive_format_real == 'iso9660' {
ensure_packages($::nova::params::mkisofs_package_name, {
tag => ['openstack', 'nova-support-package'],
})
}
nova_config {
'DEFAULT/config_drive_format': value => $config_drive_format;
'DEFAULT/config_drive_format': value => $config_drive_format_real;
}
}

5
releasenotes/notes/deprecate-config_drive_format-967c9ff273dc854b.yaml Normal file
View File

@ -0,0 +1,5 @@
---
deprecations:
- |
The ``nova::compute::config_drive_format`` parameter has been deprecated,
because the ``config_drive_format`` option in nova has been deprecated.