From 947c88e0181e63cd92eebc30ea72277b019caac3 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Thu, 18 Jun 2020 10:49:31 +0900 Subject: [PATCH] Deprecate nova::upgrade_level_console parameter ... because the actual parameter in nova was already removed[1]. [1] https://github.com/openstack/nova/commit/6537a537f9efccf078783a0c9646d9e36fd30d65 Change-Id: Iacda0309408ca1c457218a66bbee50b77ed36586 (cherry picked from commit 0e514d7a7ab1d1e18d5c7e28ce8ab9d58f571c98) --- manifests/init.pp | 16 ++++++++++------ .../deprecate-nova-console-e838b5bd58bdec61.yaml | 5 +++++ spec/classes/nova_init_spec.rb | 2 -- 3 files changed, 15 insertions(+), 8 deletions(-) create mode 100644 releasenotes/notes/deprecate-nova-console-e838b5bd58bdec61.yaml diff --git a/manifests/init.pp b/manifests/init.pp index 7999bce75..1d17e8dd6 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -337,10 +337,6 @@ # (optional) Sets a version cap for messages sent to conductor services # Defaults to $::os_service_default # -# [*upgrade_level_console*] -# (optional) Sets a version cap for messages sent to console services -# Defaults to $::os_service_default -# # [*upgrade_level_intercell*] # (optional) Sets a version cap for messages sent between cells services # Defaults to $::os_service_default @@ -436,6 +432,10 @@ # :: # Defaults to undef # +# [*upgrade_level_console*] +# (optional) Sets a version cap for messages sent to console services +# Defaults to undef +# class nova( $ensure_package = 'present', $database_connection = undef, @@ -511,7 +511,6 @@ class nova( $upgrade_level_cert = $::os_service_default, $upgrade_level_compute = $::os_service_default, $upgrade_level_conductor = $::os_service_default, - $upgrade_level_console = $::os_service_default, $upgrade_level_intercell = $::os_service_default, $upgrade_level_network = $::os_service_default, $upgrade_level_scheduler = $::os_service_default, @@ -530,6 +529,7 @@ class nova( $database_min_pool_size = undef, $os_region_name = undef, $cinder_catalog_info = undef, + $upgrade_level_console = undef, ) inherits nova::params { include nova::deps @@ -565,6 +565,11 @@ in a future release. Use nova::cinder::catalog_info instead') already using python-glanceclient instead of old glance client.') } + if $upgrade_level_console != undef { + warning('The upgrade_level_console parameter is deprecated, and has \ +no effect.') + } + if $use_ssl { if !$cert_file { fail('The cert_file parameter is required when use_ssl is set to true') @@ -779,7 +784,6 @@ but should be one of: ssh-rsa, ssh-dsa, ssh-ecdsa.") 'upgrade_levels/cert': value => $upgrade_level_cert; 'upgrade_levels/compute': value => $upgrade_level_compute; 'upgrade_levels/conductor': value => $upgrade_level_conductor; - 'upgrade_levels/console': value => $upgrade_level_console; 'upgrade_levels/intercell': value => $upgrade_level_intercell; 'upgrade_levels/network': value => $upgrade_level_network; 'upgrade_levels/scheduler': value => $upgrade_level_scheduler; diff --git a/releasenotes/notes/deprecate-nova-console-e838b5bd58bdec61.yaml b/releasenotes/notes/deprecate-nova-console-e838b5bd58bdec61.yaml new file mode 100644 index 000000000..1a92e409b --- /dev/null +++ b/releasenotes/notes/deprecate-nova-console-e838b5bd58bdec61.yaml @@ -0,0 +1,5 @@ +--- +deprecations: + - | + The ``nova::upgrade_level_console`` parameter has been deprecated and + has no effect now. diff --git a/spec/classes/nova_init_spec.rb b/spec/classes/nova_init_spec.rb index 80075fa31..7b89bb59b 100644 --- a/spec/classes/nova_init_spec.rb +++ b/spec/classes/nova_init_spec.rb @@ -98,7 +98,6 @@ describe 'nova' do :upgrade_level_cert => '1.0.0', :upgrade_level_compute => '1.0.0', :upgrade_level_conductor => '1.0.0', - :upgrade_level_console => '1.0.0', :upgrade_level_intercell => '1.0.0', :upgrade_level_network => '1.0.0', :upgrade_level_scheduler => '1.0.0', @@ -160,7 +159,6 @@ describe 'nova' 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/console').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')