openstack/puppet-nova
Code Issues Proposed changes

Merge "Remove deprecated upgrade_level_cert"

Browse Source
This commit is contained in:
Zuul
2023-11-18 03:57:25 +00:00
committed by Gerrit Code Review
parent 348c6299d5 4aeae26b63
commit 8520c1affe
3 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
manifests/init.pp
View File

@@ -377,10 +377,6 @@
# (optional) The strategy to use for auth: noauth or keystone. # (optional) The strategy to use for auth: noauth or keystone.
# Defaults to undef # Defaults to undef
# #
# [*upgrade_level_cert*]
# (optional) Sets a version cap for messages sent to cert services
# Defaults to undef
#
# [*upgrade_level_cells*] # [*upgrade_level_cells*]
# (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 undef # Defaults to undef
@@ -473,7 +469,6 @@ class nova(
$instance_name_template = $facts['os_service_default'], $instance_name_template = $facts['os_service_default'],
# DEPRECATED PARAMETERS # DEPRECATED PARAMETERS
$auth_strategy = undef, $auth_strategy = undef,
$upgrade_level_cert = undef,
$upgrade_level_cells = undef, $upgrade_level_cells = undef,
$upgrade_level_intercell = undef, $upgrade_level_intercell = undef,
$periodic_interval = undef, $periodic_interval = undef,
@@ -486,11 +481,6 @@ class nova(
warning('enabled_ssl_apis is empty but use_ssl is set to true') warning('enabled_ssl_apis is empty but use_ssl is set to true')
} }
if $upgrade_level_cert != undef {
warning("The upgrade_level_cert parameter is deprecated and will be removed \
in a future release.")
}
[ 'upgrade_level_cells', 'upgrade_level_intercell' ].each |String $ug_cell_opt| { [ 'upgrade_level_cells', 'upgrade_level_intercell' ].each |String $ug_cell_opt| {
if getvar($ug_cell_opt) != undef { if getvar($ug_cell_opt) != undef {
warning("The ${ug_cell_opt} is deprecated and has no effect.") warning("The ${ug_cell_opt} is deprecated and has no effect.")
@@ -701,7 +691,6 @@ but should be one of: ssh-rsa, ssh-dsa, ssh-ecdsa, ssh-ed25519.")
oslo::concurrency { 'nova_config': lock_path => $lock_path } oslo::concurrency { 'nova_config': lock_path => $lock_path }
nova_config { nova_config {
'upgrade_levels/cert': value => pick($upgrade_level_cert, $facts['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/scheduler': value => $upgrade_level_scheduler; 'upgrade_levels/scheduler': value => $upgrade_level_scheduler;

4
releasenotes/notes/upgrade_level_cert-9b65143963092747.yaml Normal file
View File

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

2
spec/classes/nova_init_spec.rb
View File

@@ -155,7 +155,6 @@ describe 'nova' do
:report_interval => '10', :report_interval => '10',
:periodic_fuzzy_delay => '61', :periodic_fuzzy_delay => '61',
:ovsdb_connection => 'tcp:127.0.0.1:6640', :ovsdb_connection => 'tcp:127.0.0.1:6640',
:upgrade_level_cert => '1.0.0',
: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_scheduler => '1.0.0', :upgrade_level_scheduler => '1.0.0',
@@ -240,7 +239,6 @@ describe 'nova' do
end end
it 'configures upgrade_levels' do it 'configures upgrade_levels' do
is_expected.to contain_nova_config('upgrade_levels/cert').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/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/scheduler').with_value('1.0.0') is_expected.to contain_nova_config('upgrade_levels/scheduler').with_value('1.0.0')