openstack
/
puppet-nova
Code Issues Proposed changes

Merge "Deprecate nova::upgrade_level_console parameter"

This commit is contained in:
Zuul 2020-06-18 16:25:51 +00:00 committed by Gerrit Code Review
parent 9d152c8703 947c88e018
commit 24d852ec88
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
manifests/init.pp
View File

@ -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 @@
# <service_type>:<service_name>:<endpoint_type>
# 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;

5
releasenotes/notes/deprecate-nova-console-e838b5bd58bdec61.yaml Normal file
View File

@ -0,0 +1,5 @@
---
deprecations:
- |
The ``nova::upgrade_level_console`` parameter has been deprecated and
has no effect now.

2
spec/classes/nova_init_spec.rb
View File

@ -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')