openstack/puppet-magnum
Code Issues Proposed changes

Deprecate conductor_life_check_timeout

Browse Source 
This option has been unused, and was removed from magnum.

Depneds-on: https://review.opendev.org/912027
Change-Id: I055ef530f164f80646ab70ac91a10c2f584048e7
This commit is contained in:
Takashi Kajinami 2024-07-30 22:50:14 +09:00
parent 6422bbef82
commit 4feba93488
3 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
manifests/conductor.pp
View File

@ -16,11 +16,6 @@
# (optional) The state of the magnum conductor package # (optional) The state of the magnum conductor package
# Defaults to 'present' # Defaults to 'present'
# #
# [*conductor_life_check_timeout*]
# (optional) RPC timeout for the conductor liveness check that is
# used for bay locking.
# Defaults to $facts['os_service_default']
#
# [*auth_strategy*] # [*auth_strategy*]
# (optional) Type of authentication to be used. # (optional) Type of authentication to be used.
# Defaults to 'keystone' # Defaults to 'keystone'
@ -29,19 +24,32 @@
# (optional) Number of conductor workers. # (optional) Number of conductor workers.
# Defaults to $facts['os_workers'] # Defaults to $facts['os_workers']
# #
# DEPRECATED PARAMETERS
#
# [*conductor_life_check_timeout*]
# (optional) RPC timeout for the conductor liveness check that is
# used for bay locking.
# Defaults to undef
#
class magnum::conductor( class magnum::conductor(
Boolean $enabled = true, Boolean $enabled = true,
Boolean $manage_service = true, Boolean $manage_service = true,
$package_ensure = 'present', $package_ensure = 'present',
$conductor_life_check_timeout = $facts['os_service_default'],
$auth_strategy = 'keystone', $auth_strategy = 'keystone',
$workers = $facts['os_workers'], $workers = $facts['os_workers'],
# DEPRECATED PARAMETERS
$conductor_life_check_timeout = undef,
) { ) {
include magnum::db include magnum::db
include magnum::deps include magnum::deps
include magnum::params include magnum::params
if $conductor_life_check_timeout != undef {
warning("The conductor_life_check_timeout parameter has been deprecated \
and has no effect.")
}
# Install package # Install package
package { 'magnum-conductor': package { 'magnum-conductor':
ensure => $package_ensure, ensure => $package_ensure,
@ -67,8 +75,12 @@ class magnum::conductor(
} }
magnum_config { magnum_config {
'conductor/conductor_life_check_timeout': value => $conductor_life_check_timeout; 'conductor/workers': value => $workers;
'conductor/workers': value => $workers; }
# Remove this and conductor_life_check_timeout after 2025.1 release
magnum_config {
'conductor/conductor_life_check_timeout': ensure => absent;
} }
if $auth_strategy == 'keystone' { if $auth_strategy == 'keystone' {

5
releasenotes/notes/deprecate-conductor_life_check_timeout-256bd693848a296c.yaml Normal file
View File

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

9
spec/classes/magnum_conductor_spec.rb
View File

@ -23,18 +23,9 @@ describe 'magnum::conductor' do
) } ) }
it { it {
is_expected.to contain_magnum_config('conductor/conductor_life_check_timeout').with_value('<SERVICE DEFAULT>')
is_expected.to contain_magnum_config('conductor/workers').with_value(facts[:os_workers]) is_expected.to contain_magnum_config('conductor/workers').with_value(facts[:os_workers])
} }
context 'with conductor_life_check_timeout specified' do
let :params do
{ :conductor_life_check_timeout => '4' }
end
it { is_expected.to contain_magnum_config('conductor/conductor_life_check_timeout').with_value('4') }
end
context 'with manage_service as false' do context 'with manage_service as false' do
let :params do let :params do
{ :enabled => true, { :enabled => true,