Remove ceilometer client class

The ceilometer client has been retired upstream and the class has been
previously deprecated. Since the package may be going away, we need to
remove the client class.

https://review.openstack.org/#/c/522183/

Change-Id: I3e10b80d5115b32bb4aa480276303ac6136f175f

diff --git a/README.md b/README.md
index 57145686946f7d6dbbb813c0672b5af1213f0c07..498d98961e5d28271a77c6a6db803859479e3ffc 100644 (file)
--- a/README.md
+++ b/README.md
@@ -56,7 +56,6 @@ class { '::ceilometer':
 class { '::ceilometer::keystone::auth':
   password => 'a_big_secret',
 }
-class { '::ceilometer::client': }
 class { '::ceilometer::collector': }
 class { '::ceilometer::expirer': }
 class { '::ceilometer::agent::polling': }

diff --git a/examples/ceilometer_with_gnocchi.pp b/examples/ceilometer_with_gnocchi.pp
index adc3ff0a6bc7963518a1bfa0a95a6ce5b71f39d7..9fddaa913743e3df0609f28cd8f3d4737b38e04e 100644 (file)
--- a/examples/ceilometer_with_gnocchi.pp
+++ b/examples/ceilometer_with_gnocchi.pp
@@ -13,7 +13,6 @@ class { '::ceilometer::db':
 class { '::ceilometer::keystone::auth':
   password => 'a_big_secret',
 }
-class { '::ceilometer::client': }
 class { '::ceilometer::expirer': }
 class { '::ceilometer::agent::polling': }
 class { '::ceilometer::agent::notification': }

diff --git a/manifests/client.pp b/manifests/client.pp
deleted file mode 100644 (file)
index 1e95ca7..0000000
--- a/manifests/client.pp
+++ /dev/null
@@ -1,28 +0,0 @@
-# == Class: ceilometer::client
-#
-# Installs the ceilometer python library.
-#
-# === Parameters:
-#
-# [*ensure*]
-#   (Optional) Ensure state for pachage.
-#   Defaults to 'present'.
-#
-class ceilometer::client (
-  $ensure = 'present'
-) {
-
-  include ::ceilometer::deps
-  include ::ceilometer::params
-
-  warning('This class is deprecated and will be removed in future releases.
-           Use gnocchi, aodh or panko clients to access data instead.')
-
-  package { 'python-ceilometerclient':
-    ensure => $ensure,
-    name   => $::ceilometer::params::client_package_name,
-    tag    => 'openstack',
-  }
-
-}
-

diff --git a/releasenotes/notes/ceilometer-client-removal-e36598e0e1d66231.yaml b/releasenotes/notes/ceilometer-client-removal-e36598e0e1d66231.yaml
new file mode 100644 (file)
index 0000000..f8366fc
--- /dev/null
+++ b/releasenotes/notes/ceilometer-client-removal-e36598e0e1d66231.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    Ceilometer client has been removed from the upstream so the ceilomter::client
+    class has been removed.

diff --git a/spec/acceptance/ceilometer_wsgi_apache_spec.rb b/spec/acceptance/ceilometer_wsgi_apache_spec.rb
index 5979e29f601d928197d1452971c88c32420c151e..677768fca95c062a18e15a91826b294d806cbcbd 100644 (file)
--- a/spec/acceptance/ceilometer_wsgi_apache_spec.rb
+++ b/spec/acceptance/ceilometer_wsgi_apache_spec.rb
@@ -50,7 +50,6 @@ describe 'ceilometer with mysql' do
       class { '::ceilometer::db::sync':
         extra_params => '--skip-gnocchi-resource-types',
       }
-      class { '::ceilometer::client': }
       class { '::ceilometer::expirer': }
       class { '::ceilometer::agent::central': }
       class { '::ceilometer::agent::notification': }

diff --git a/spec/classes/ceilometer_client_spec.rb b/spec/classes/ceilometer_client_spec.rb
deleted file mode 100644 (file)
index 789d5e7..0000000
--- a/spec/classes/ceilometer_client_spec.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-require 'spec_helper'
-
-describe 'ceilometer::client' do
-
-  shared_examples_for 'ceilometer client' do
-
-    it { is_expected.to contain_class('ceilometer::deps') }
-    it { is_expected.to contain_class('ceilometer::params') }
-
-    it 'installs ceilometer client package' do
-      is_expected.to contain_package('python-ceilometerclient').with(
-        :ensure => 'present',
-        :name   => platform_params[:client_package_name],
-        :tag    => 'openstack',
-      )
-    end
-  end
-
-  on_supported_os({
-    :supported_os => OSDefaults.get_supported_os
-  }).each do |os,facts|
-    context "on #{os}" do
-      let (:facts) do
-        facts.merge!(OSDefaults.get_facts())
-      end
-
-      let :platform_params do
-        { :client_package_name => 'python-ceilometerclient' }
-      end
-
-      it_behaves_like 'ceilometer client'
-    end
-  end
-
-end