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

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

[1] 1155b41db051e95e9246aa02eed2205f1f0f845a

Change-Id: I0885b79bd83bcc3b41b8da0bd0fd00f29d176f13

diff --git a/manifests/agent/polling.pp b/manifests/agent/polling.pp
index 35d75ac520cc699e41be447e3fbe5023319a9566..4008e0939d5558fc29fca7817176e09308a87c33 100644 (file)
--- 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 2bc8127f40c1657bf34525a1cbdb1b821b6f8091..1b9c518355126fbf02b7a4ec7345c7f420059b31 100644 (file)
--- 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 (file)
index 0000000..59c983b
--- /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 634814bdd4ef2230dddfc142ea130335c0fbd368..873bbe4c3170195925d1d7e4861419c3dcbd9aaa 100644 (file)
--- 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 )