Remove deprecated cells v1 upgrade_levels parameters
These were deprecated during 2023.2 cycle[1] so can be removed now.
[1] adbb5ce857
Change-Id: If10406a2e5872277ca56638f35d5bfaa44458ec9
This commit is contained in:
parent
ddde8befa8
commit
1faa288038
|
@ -381,14 +381,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_cells*]
|
|
||||||
# (optional) Sets a version cap for messages sent to local cells services
|
|
||||||
# Defaults to undef
|
|
||||||
#
|
|
||||||
# [*upgrade_level_intercell*]
|
|
||||||
# (optional) Sets a version cap for messages sent between cells services
|
|
||||||
# Defaults to undef
|
|
||||||
#
|
|
||||||
# [*periodic_interval*]
|
# [*periodic_interval*]
|
||||||
# (optional) Seconds between running periodic tasks.
|
# (optional) Seconds between running periodic tasks.
|
||||||
# Defaults to undef
|
# Defaults to undef
|
||||||
|
@ -474,8 +466,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_cells = undef,
|
|
||||||
$upgrade_level_intercell = undef,
|
|
||||||
$periodic_interval = undef,
|
$periodic_interval = undef,
|
||||||
) inherits nova::params {
|
) inherits nova::params {
|
||||||
|
|
||||||
|
@ -486,12 +476,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')
|
||||||
}
|
}
|
||||||
|
|
||||||
[ '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.")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if $periodic_interval != undef {
|
if $periodic_interval != undef {
|
||||||
warning('The periodic_interval parameter is deprecated and has no effect.')
|
warning('The periodic_interval parameter is deprecated and has no effect.')
|
||||||
}
|
}
|
||||||
|
@ -702,9 +686,4 @@ but should be one of: ssh-rsa, ssh-dsa, ssh-ecdsa, ssh-ed25519.")
|
||||||
'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;
|
||||||
}
|
}
|
||||||
|
|
||||||
nova_config {
|
|
||||||
'upgrade_levels/cells': ensure => absent;
|
|
||||||
'upgrade_levels/intercell': ensure => absent;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
---
|
||||||
|
features:
|
||||||
|
- |
|
||||||
|
The ``nova::upgrade_level_cells`` parameter and
|
||||||
|
the ``nova::upgrade_level_intercell`` parameter have been removed.
|
|
@ -245,9 +245,6 @@ describe 'nova' do
|
||||||
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')
|
||||||
|
|
||||||
is_expected.to contain_nova_config('upgrade_levels/cells').with_ensure('absent')
|
|
||||||
is_expected.to contain_nova_config('upgrade_levels/intercell').with_ensure('absent')
|
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'configures various things' do
|
it 'configures various things' do
|
||||||
|
|
Loading…
Reference in New Issue