From 4aeae26b63524246dddbfdb3015a1535acf6a312 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Wed, 13 Sep 2023 16:27:27 +0900 Subject: [PATCH] Remove deprecated upgrade_level_cert This parameter was deprecated in Zed release[1], so can be removed now. [1] 5ee0f096053f5cc6f78b23b9d531a20203907bed Change-Id: Ifc57d0e7d59b78af1a304fcc359c91211faebf66 --- manifests/init.pp | 17 +++-------------- .../upgrade_level_cert-9b65143963092747.yaml | 4 ++++ spec/classes/nova_init_spec.rb | 2 -- 3 files changed, 7 insertions(+), 16 deletions(-) create mode 100644 releasenotes/notes/upgrade_level_cert-9b65143963092747.yaml diff --git a/manifests/init.pp b/manifests/init.pp index f31950e89..1f41f4d20 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -377,10 +377,6 @@ # (optional) The strategy to use for auth: noauth or keystone. # Defaults to undef # -# [*upgrade_level_cert*] -# (optional) Sets a version cap for messages sent to cert services -# Defaults to undef -# # [*upgrade_level_cells*] # (optional) Sets a version cap for messages sent to local cells services # Defaults to undef @@ -473,7 +469,6 @@ class nova( $instance_name_template = $facts['os_service_default'], # DEPRECATED PARAMETERS $auth_strategy = undef, - $upgrade_level_cert = undef, $upgrade_level_cells = undef, $upgrade_level_intercell = undef, $periodic_interval = undef, @@ -486,11 +481,6 @@ class nova( 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| { if getvar($ug_cell_opt) != undef { warning("The ${ug_cell_opt} is deprecated and has no effect.") @@ -701,10 +691,9 @@ but should be one of: ssh-rsa, ssh-dsa, ssh-ecdsa, ssh-ed25519.") oslo::concurrency { 'nova_config': lock_path => $lock_path } nova_config { - 'upgrade_levels/cert': value => pick($upgrade_level_cert, $facts['os_service_default']); - 'upgrade_levels/compute': value => $upgrade_level_compute; - 'upgrade_levels/conductor': value => $upgrade_level_conductor; - 'upgrade_levels/scheduler': value => $upgrade_level_scheduler; + 'upgrade_levels/compute': value => $upgrade_level_compute; + 'upgrade_levels/conductor': value => $upgrade_level_conductor; + 'upgrade_levels/scheduler': value => $upgrade_level_scheduler; } nova_config { diff --git a/releasenotes/notes/upgrade_level_cert-9b65143963092747.yaml b/releasenotes/notes/upgrade_level_cert-9b65143963092747.yaml new file mode 100644 index 000000000..5c4c4d0a8 --- /dev/null +++ b/releasenotes/notes/upgrade_level_cert-9b65143963092747.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - | + The ``nova::upgrade_level_cert`` parameter has been removed. diff --git a/spec/classes/nova_init_spec.rb b/spec/classes/nova_init_spec.rb index 3065c77be..b5a22d60e 100644 --- a/spec/classes/nova_init_spec.rb +++ b/spec/classes/nova_init_spec.rb @@ -155,7 +155,6 @@ describe 'nova' do :report_interval => '10', :periodic_fuzzy_delay => '61', :ovsdb_connection => 'tcp:127.0.0.1:6640', - :upgrade_level_cert => '1.0.0', :upgrade_level_compute => '1.0.0', :upgrade_level_conductor => '1.0.0', :upgrade_level_scheduler => '1.0.0', @@ -240,7 +239,6 @@ describe 'nova' do end 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/conductor').with_value('1.0.0') is_expected.to contain_nova_config('upgrade_levels/scheduler').with_value('1.0.0')