openstack
/
puppet-nova
Code Issues Proposed changes

Merge "Deprecate support for [upgrade_levels] network"

This commit is contained in:
Zuul 2022-11-28 13:01:15 +00:00 committed by Gerrit Code Review
parent 68c507ffe8 feb79359eb
commit 422770b70f
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
manifests/init.pp
View File

@ -303,10 +303,6 @@
# (optional) Sets a version cap for messages sent between cells services # (optional) Sets a version cap for messages sent between cells services
# Defaults to $::os_service_default # Defaults to $::os_service_default
# #
# [*upgrade_level_network*]
# (optional) Sets a version cap for messages sent to network services
# Defaults to $::os_service_default
#
# [*upgrade_level_scheduler*] # [*upgrade_level_scheduler*]
# (optional) Sets a version cap for messages sent to scheduler services # (optional) Sets a version cap for messages sent to scheduler services
# Defaults to $::os_service_default # Defaults to $::os_service_default
@ -366,6 +362,10 @@
# (optional) Sets a version cap for messages sent to cert services # (optional) Sets a version cap for messages sent to cert services
# Defaults to undef # Defaults to undef
# #
# [*upgrade_level_network*]
# (optional) Sets a version cap for messages sent to network services
# Defaults to $::os_service_default
#
class nova( class nova(
$ensure_package = 'present', $ensure_package = 'present',
$default_transport_url = $::os_service_default, $default_transport_url = $::os_service_default,
@ -430,7 +430,6 @@ class nova(
$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,
$upgrade_level_network = $::os_service_default,
$upgrade_level_scheduler = $::os_service_default, $upgrade_level_scheduler = $::os_service_default,
$cpu_allocation_ratio = $::os_service_default, $cpu_allocation_ratio = $::os_service_default,
$ram_allocation_ratio = $::os_service_default, $ram_allocation_ratio = $::os_service_default,
@ -444,6 +443,7 @@ class nova(
# DEPRECATED PARAMETERS # DEPRECATED PARAMETERS
$auth_strategy = undef, $auth_strategy = undef,
$upgrade_level_cert = undef, $upgrade_level_cert = undef,
$upgrade_level_network = undef,
) inherits nova::params { ) inherits nova::params {
include nova::deps include nova::deps
@ -455,8 +455,13 @@ class nova(
} }
if $upgrade_level_cert != undef { if $upgrade_level_cert != undef {
warning('The upgrade_level_cert parameter is deprecated and will be removed \ warning("The upgrade_level_cert parameter is deprecated and will be removed \
in a future release.') in a future release.")
}
if $upgrade_level_network != undef {
warning("The upgrade_level_network parameter is deprecated and will be removed \
in a future release.")
} }
if $use_ssl { if $use_ssl {
@ -678,7 +683,7 @@ but should be one of: ssh-rsa, ssh-dsa, ssh-ecdsa.")
'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;
'upgrade_levels/network': value => $upgrade_level_network; 'upgrade_levels/network': value => pick($upgrade_level_network, $::os_service_default);
'upgrade_levels/scheduler': value => $upgrade_level_scheduler; 'upgrade_levels/scheduler': value => $upgrade_level_scheduler;
} }
} }

5
releasenotes/notes/deprecate-upgrade_level_network-64301c66337d1ad0.yaml Normal file
View File

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