openstack/puppet-nova
Code Issues Proposed changes

upgrade_levels: Deprecate support for cells v1 options

Browse Source 
These options were already removed when cells v1 was removed from nova
by [1].

[1] 10bbe6b739df7233186c971441d3dbdf9475b58e

Change-Id: I1e55a7eced8ed16ecae3aa78f268e91b15bda5b4
This commit is contained in:
Takashi Kajinami
2023-07-12 21:40:26 +09:00
parent 49d656ed86
commit adbb5ce857
3 changed files with 29 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
manifests/init.pp
View File

@@ -291,10 +291,6 @@
# to interact with openvswitch on the host.
# Defaults to $facts['os_service_default']
#
# [*upgrade_level_cells*]
# (optional) Sets a version cap for messages sent to local cells services
# Defaults to $facts['os_service_default']
#
# [*upgrade_level_compute*]
# (optional) Sets a version cap for messages sent to compute services
# Defaults to $facts['os_service_default']
@@ -303,10 +299,6 @@
# (optional) Sets a version cap for messages sent to conductor services
# Defaults to $facts['os_service_default']
#
# [*upgrade_level_intercell*]
# (optional) Sets a version cap for messages sent between cells services
# Defaults to $facts['os_service_default']
#
# [*upgrade_level_scheduler*]
# (optional) Sets a version cap for messages sent to scheduler services
# Defaults to $facts['os_service_default']
@@ -370,6 +362,14 @@
# (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
#
# [*upgrade_level_intercell*]
# (optional) Sets a version cap for messages sent between cells services
# Defaults to undef
#
class nova(
$ensure_package = 'present',
$default_transport_url = $facts['os_service_default'],
@@ -431,10 +431,8 @@ class nova(
$notification_format = $facts['os_service_default'],
$notify_on_state_change = undef,
$ovsdb_connection = $facts['os_service_default'],
$upgrade_level_cells = $facts['os_service_default'],
$upgrade_level_compute = $facts['os_service_default'],
$upgrade_level_conductor = $facts['os_service_default'],
$upgrade_level_intercell = $facts['os_service_default'],
$upgrade_level_scheduler = $facts['os_service_default'],
$cpu_allocation_ratio = $facts['os_service_default'],
$ram_allocation_ratio = $facts['os_service_default'],
@@ -449,6 +447,8 @@ class nova(
# DEPRECATED PARAMETERS
$auth_strategy = undef,
$upgrade_level_cert = undef,
$upgrade_level_cells = undef,
$upgrade_level_intercell = undef,
) inherits nova::params {
include nova::deps
@@ -463,6 +463,12 @@ class nova(
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.")
}
}
if $use_ssl {
if !$cert_file {
fail('The cert_file parameter is required when use_ssl is set to true')
@@ -672,11 +678,14 @@ but should be one of: ssh-rsa, ssh-dsa, ssh-ecdsa.")
}
nova_config {
'upgrade_levels/cells': value => $upgrade_level_cells;
'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/intercell': value => $upgrade_level_intercell;
'upgrade_levels/scheduler': value => $upgrade_level_scheduler;
}
nova_config {
'upgrade_levels/cells': ensure => absent;
'upgrade_levels/intercell': ensure => absent;
}
}

5
releasenotes/notes/upgrade_levels-cells-v1-b411b2e4305dcd94.yaml Normal file
View File

@@ -0,0 +1,5 @@
---
deprecations:
- |
The ``upgrade_level_cells`` parameter and the ``upgrade_level_intercell``
parameter of the ``nova`` class have been deprecated and have no effect.

7
spec/classes/nova_init_spec.rb
View File

@@ -143,11 +143,9 @@ describe 'nova' do
:notification_format => 'unversioned',
:report_interval => '60',
:ovsdb_connection => 'tcp:127.0.0.1:6640',
:upgrade_level_cells => '1.0.0',
:upgrade_level_cert => '1.0.0',
:upgrade_level_compute => '1.0.0',
:upgrade_level_conductor => '1.0.0',
:upgrade_level_intercell => '1.0.0',
:upgrade_level_scheduler => '1.0.0',
:purge_config => false,
:my_ip => '192.0.2.1',
@@ -226,12 +224,13 @@ describe 'nova' do
end
it 'configures upgrade_levels' do
is_expected.to contain_nova_config('upgrade_levels/cells').with_value('1.0.0')
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/intercell').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