openstack
/
puppet-mistral
Code Issues Proposed changes

Merge "Remove deprecated mistral::coordination_* parameters"

This commit is contained in:
Zuul 2022-08-12 07:51:35 +00:00 committed by Gerrit Code Review
parent 297f8ba825 a6810cd771
commit 49d34a7d65
4 changed files with 9 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/coordination.pp
View File

@ -19,14 +19,11 @@ class mistral::coordination (
include mistral::deps
$backend_url_real = pick($::mistral::coordination_backend_url, $backend_url)
$heartbeat_interval_real = pick($::mistral::coordination_heartbeat_interval, $heartbeat_interval)
oslo::coordination{ 'mistral_config':
backend_url => $backend_url_real
backend_url => $backend_url
}
mistral_config {
'coordination/heartbeat_interval': value => $heartbeat_interval_real;
'coordination/heartbeat_interval': value => $heartbeat_interval;
}
}

18
manifests/init.pp
View File

@ -152,16 +152,6 @@
# heartbeat.
# Defaults to $::os_service_default
#
# DEPRECATED PARAMETERS
#
# [*coordination_backend_url*]
# (optional) The backend URL to be used for coordination.
# Defaults to $::os_service_default
#
# [*coordination_heartbeat_interval*]
# (optional) Number of seconds between heartbeats for coordination.
# Defaults to $::os_service_default
#
class mistral(
$package_ensure = 'present',
$os_actions_endpoint_type = $::os_service_default,
@ -190,20 +180,12 @@ class mistral(
$max_missed_heartbeats = $::os_service_default,
$check_interval = $::os_service_default,
$first_heartbeat_timeout = $::os_service_default,
# DEPRECATED PARAMETERS
$coordination_backend_url = undef,
$coordination_heartbeat_interval = undef,
){
include mistral::deps
include mistral::params
include mistral::db
if $coordination_backend_url != undef or $coordination_heartbeat_interval != undef {
warning('The mistral::coordination_* parameters are deprecated. Use mistral::coordination instead')
include mistral::coordination
}
package { 'mistral-common':
ensure => $package_ensure,
name => $::mistral::params::common_package_name,

7
releasenotes/notes/cleanup-coordination-590887c92de88031.yaml Normal file
View File

@ -0,0 +1,7 @@
---
upgrade:
- |
The following parameters have been removed.
- ``mistral::coordination_backend_url``
- ``mistral::coordination_heartbeat_interval``

14
spec/classes/mistral_init_spec.rb
View File

@ -172,20 +172,6 @@ describe 'mistral' do
)}
end
context 'with coordination' do
let :params do
req_params.merge({
:coordination_backend_url => 'redis://127.0.0.1',
:coordination_heartbeat_interval => '10.0',
})
end
it 'should contain coordination config' do
is_expected.to contain_mistral_config('coordination/backend_url').with(:value => 'redis://127.0.0.1')
is_expected.to contain_mistral_config('coordination/heartbeat_interval').with(:value => '10.0')
end
end
context 'with os_actions_keystone_endpoint overridden' do
let :params do
req_params.merge({