Remove deprecated ceilometer::agent::polling::coordination_url

... because it was deprecated during Xena cycle[1] in favor of the new
ceilometer::coordination class.

[1] 1155b41db0

Change-Id: I0885b79bd83bcc3b41b8da0bd0fd00f29d176f13
This commit is contained in:
Takashi Kajinami 2022-08-05 01:14:13 +09:00
parent 588c9c9501
commit 2f053934da
4 changed files with 6 additions and 24 deletions

View File

@ -73,12 +73,6 @@
# (Optional) Batch size of samples to send to notification agent.
# Defaults to $::os_service_default
#
# DEPRECATED PARAMETERS
#
# [*coordination_url*]
# (Optional) The url to use for distributed group membership coordination.
# Defaults to undef.
#
class ceilometer::agent::polling (
$manage_service = true,
$enabled = true,
@ -95,18 +89,11 @@ class ceilometer::agent::polling (
$polling_meters = $::ceilometer::params::polling_meters,
$polling_config = undef,
$batch_size = $::os_service_default,
# DEPRECATED PARAMETERS
$coordination_url = undef,
) inherits ceilometer {
include ceilometer::deps
include ceilometer::params
if $coordination_url != undef {
warning('The coordination_url parameter has been deprecated. Use ceilometer::coordination instead')
include ceilometer::coordination
}
if $central_namespace {
$central_namespace_name = 'central'
} else {

View File

@ -14,9 +14,7 @@ class ceilometer::coordination (
include ceilometer::deps
$backend_url_real = pick($::ceilometer::agent::polling::coordination_url, $backend_url)
oslo::coordination{ 'ceilometer_config':
backend_url => $backend_url_real
backend_url => $backend_url
}
}

View File

@ -0,0 +1,5 @@
---
upgrade:
- |
The ``ceilometer::agent::polling::coordination_url`` parameter has been
removed.

View File

@ -262,14 +262,6 @@ sources:
it { should_not contain_file('polling') }
end
context 'when setting coordination_url' do
before do
params.merge!( :coordination_url => 'redis://localhost:6379' )
end
it { should contain_ceilometer_config('coordination/backend_url').with_value('redis://localhost:6379') }
end
context 'when batch_size is set' do
before do
params.merge!( :batch_size => 50 )