openstack
/
puppet-nova
Code Issues Proposed changes

Merge "Remove deprecated cells v1 upgrade_levels parameters"

This commit is contained in:
Zuul 2024-04-25 15:20:39 +00:00 committed by Gerrit Code Review
parent 1ebe4ac2c8 1faa288038
commit 1aa4cce270
3 changed files with 5 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
manifests/init.pp
View File

@ -381,14 +381,6 @@
# (optional) The strategy to use for auth: noauth or keystone.
# 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*]
# (optional) Seconds between running periodic tasks.
# Defaults to undef
@ -474,8 +466,6 @@ class nova(
$instance_name_template = $facts['os_service_default'],
# DEPRECATED PARAMETERS
$auth_strategy = undef,
$upgrade_level_cells = undef,
$upgrade_level_intercell = undef,
$periodic_interval = undef,
) inherits nova::params {
@ -486,12 +476,6 @@ class nova(
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 {
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/scheduler': value => $upgrade_level_scheduler;
}
nova_config {
'upgrade_levels/cells': ensure => absent;
'upgrade_levels/intercell': ensure => absent;
}
}

5
releasenotes/notes/remove-cells-v2-upgrade-leve-opts-2bdb145cd56d0632.yaml Normal file
View File

@ -0,0 +1,5 @@
---
features:
- |
The ``nova::upgrade_level_cells`` parameter and
the ``nova::upgrade_level_intercell`` parameter have been removed.

3
spec/classes/nova_init_spec.rb
View File

@ -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/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/cells').with_ensure('absent')
is_expected.to contain_nova_config('upgrade_levels/intercell').with_ensure('absent')
end
it 'configures various things' do