openstack/puppet-nova
Code Issues Proposed changes

Deprecate support for [upgrade_levels] cert

Browse Source 
... because the parameter was already deprecated in nova[1].

[1] f0d2925bc71d0649f75fd3d281742f2e56e7e3b6

Change-Id: Ia74b2a0bd753488d146a1ac7b86818a75d4faa42
This commit is contained in:
Takashi Kajinami
2022-05-10 21:35:18 +09:00
parent a88016b1a6
commit 5ee0f09605
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
manifests/init.pp
View File

@@ -291,10 +291,6 @@
# (optional) Sets a version cap for messages sent to local cells services # (optional) Sets a version cap for messages sent to local cells services
# Defaults to $::os_service_default # Defaults to $::os_service_default
# #
# [*upgrade_level_cert*]
# (optional) Sets a version cap for messages sent to cert services
# Defaults to $::os_service_default
#
# [*upgrade_level_compute*] # [*upgrade_level_compute*]
# (optional) Sets a version cap for messages sent to compute services # (optional) Sets a version cap for messages sent to compute services
# Defaults to $::os_service_default # Defaults to $::os_service_default
@@ -397,6 +393,10 @@
# (optional) Allow attach between instance and volume in different availability zones. # (optional) Allow attach between instance and volume in different availability zones.
# Defaults to undef # Defaults to undef
# #
# [*upgrade_level_cert*]
# (optional) Sets a version cap for messages sent to cert services
# Defaults to undef
#
class nova( class nova(
$ensure_package = 'present', $ensure_package = 'present',
$default_transport_url = $::os_service_default, $default_transport_url = $::os_service_default,
@@ -458,7 +458,6 @@ class nova(
$notify_on_state_change = undef, $notify_on_state_change = undef,
$ovsdb_connection = $::os_service_default, $ovsdb_connection = $::os_service_default,
$upgrade_level_cells = $::os_service_default, $upgrade_level_cells = $::os_service_default,
$upgrade_level_cert = $::os_service_default,
$upgrade_level_compute = $::os_service_default, $upgrade_level_compute = $::os_service_default,
$upgrade_level_conductor = $::os_service_default, $upgrade_level_conductor = $::os_service_default,
$upgrade_level_intercell = $::os_service_default, $upgrade_level_intercell = $::os_service_default,
@@ -481,6 +480,7 @@ class nova(
$block_device_allocate_retries = undef, $block_device_allocate_retries = undef,
$block_device_allocate_retries_interval = undef, $block_device_allocate_retries_interval = undef,
$cross_az_attach = undef, $cross_az_attach = undef,
$upgrade_level_cert = undef,
) inherits nova::params { ) inherits nova::params {
include nova::deps include nova::deps
@@ -521,6 +521,11 @@ Use nova::compute::block_device_allocate_retries_interval instead')
Use nova::cinder::cross_az_attach instead.') Use nova::cinder::cross_az_attach instead.')
} }
if $upgrade_level_cert != undef {
warning('The upgrade_level_cert parameter is deprecated and will be removed \
in a future release.')
}
if $use_ssl { if $use_ssl {
if !$cert_file { if !$cert_file {
fail('The cert_file parameter is required when use_ssl is set to true') fail('The cert_file parameter is required when use_ssl is set to true')
@@ -734,7 +739,7 @@ but should be one of: ssh-rsa, ssh-dsa, ssh-ecdsa.")
nova_config { nova_config {
'upgrade_levels/cells': value => $upgrade_level_cells; 'upgrade_levels/cells': value => $upgrade_level_cells;
'upgrade_levels/cert': value => $upgrade_level_cert; 'upgrade_levels/cert': value => pick($upgrade_level_cert, $::os_service_default);
'upgrade_levels/compute': value => $upgrade_level_compute; 'upgrade_levels/compute': value => $upgrade_level_compute;
'upgrade_levels/conductor': value => $upgrade_level_conductor; 'upgrade_levels/conductor': value => $upgrade_level_conductor;
'upgrade_levels/intercell': value => $upgrade_level_intercell; 'upgrade_levels/intercell': value => $upgrade_level_intercell;

5
releasenotes/notes/deprecate-upgrade_level_cert-6f7dc745cd652300.yaml Normal file
View File

@@ -0,0 +1,5 @@
---
deprecations:
- |
The ``nova::upgrade_level_cert`` parameter has been deprecated and will be
removed in a future release.