diff --git a/manifests/agent/polling.pp b/manifests/agent/polling.pp index 35d75ac5..4008e093 100644 --- a/manifests/agent/polling.pp +++ b/manifests/agent/polling.pp @@ -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 { diff --git a/manifests/coordination.pp b/manifests/coordination.pp index 2bc8127f..1b9c5183 100644 --- a/manifests/coordination.pp +++ b/manifests/coordination.pp @@ -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 } } diff --git a/releasenotes/notes/cleanup-coordination-bb6eb0dfca973ceb.yaml b/releasenotes/notes/cleanup-coordination-bb6eb0dfca973ceb.yaml new file mode 100644 index 00000000..59c983bb --- /dev/null +++ b/releasenotes/notes/cleanup-coordination-bb6eb0dfca973ceb.yaml @@ -0,0 +1,5 @@ +--- +upgrade: + - | + The ``ceilometer::agent::polling::coordination_url`` parameter has been + removed. diff --git a/spec/classes/ceilometer_agent_polling_spec.rb b/spec/classes/ceilometer_agent_polling_spec.rb index 634814bd..873bbe4c 100644 --- a/spec/classes/ceilometer_agent_polling_spec.rb +++ b/spec/classes/ceilometer_agent_polling_spec.rb @@ -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 )