Remove deprecated upgrade_level_cert
This parameter was deprecated in Zed release[1], so can be removed now.
[1] 5ee0f09605
Change-Id: Ifc57d0e7d59b78af1a304fcc359c91211faebf66
This commit is contained in:
parent
9412e22cdd
commit
4aeae26b63
@ -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 {
|
||||
|
@ -0,0 +1,4 @@
|
||||
---
|
||||
upgrade:
|
||||
- |
|
||||
The ``nova::upgrade_level_cert`` parameter has been removed.
|
@ -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')
|
||||
|
Loading…
Reference in New Issue
Block a user