openstack/puppet-nova
Code Issues Proposed changes

Remove support for [upgrade_levels] network

Browse Source 
... because it was deprecated during 2023.1 cycle[1]. The actual option
was already removed from nova.

[1] feb79359eb

Change-Id: I753ec109f5bd4ee230417f7412dbd50f4ab930da
This commit is contained in:
Takashi Kajinami
2023-04-07 15:18:32 +09:00
parent a1c5e3ebf4
commit b3772a4185
3 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
manifests/init.pp
View File

@@ -370,10 +370,6 @@
# (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 $facts['os_service_default']
#
class nova( class nova(
$ensure_package = 'present', $ensure_package = 'present',
$default_transport_url = $facts['os_service_default'], $default_transport_url = $facts['os_service_default'],
@@ -453,7 +449,6 @@ 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
@@ -471,11 +466,6 @@ class nova(
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 {
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')
@@ -697,7 +687,6 @@ 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 => pick($upgrade_level_network, $facts['os_service_default']);
'upgrade_levels/scheduler': value => $upgrade_level_scheduler; 'upgrade_levels/scheduler': value => $upgrade_level_scheduler;
} }
} }

4
releasenotes/notes/remove-upgrade_level_network-e485e6fdb0c17c30.yaml Normal file
View File

@@ -0,0 +1,4 @@
---
upgrade:
- |
The ``nova::upgrade_level_network`` parameter has been removed.

2
spec/classes/nova_init_spec.rb
View File

@@ -150,7 +150,6 @@ describe 'nova' do
:upgrade_level_compute => '1.0.0', :upgrade_level_compute => '1.0.0',
:upgrade_level_conductor => '1.0.0', :upgrade_level_conductor => '1.0.0',
:upgrade_level_intercell => '1.0.0', :upgrade_level_intercell => '1.0.0',
:upgrade_level_network => '1.0.0',
:upgrade_level_scheduler => '1.0.0', :upgrade_level_scheduler => '1.0.0',
:purge_config => false, :purge_config => false,
:my_ip => '192.0.2.1', :my_ip => '192.0.2.1',
@@ -234,7 +233,6 @@ describe 'nova' do
is_expected.to contain_nova_config('upgrade_levels/compute').with_value('1.0.0') is_expected.to contain_nova_config('upgrade_levels/compute').with_value('1.0.0')
is_expected.to contain_nova_config('upgrade_levels/conductor').with_value('1.0.0') is_expected.to contain_nova_config('upgrade_levels/conductor').with_value('1.0.0')
is_expected.to contain_nova_config('upgrade_levels/intercell').with_value('1.0.0') is_expected.to contain_nova_config('upgrade_levels/intercell').with_value('1.0.0')
is_expected.to contain_nova_config('upgrade_levels/network').with_value('1.0.0')
is_expected.to contain_nova_config('upgrade_levels/scheduler').with_value('1.0.0') is_expected.to contain_nova_config('upgrade_levels/scheduler').with_value('1.0.0')
end end