From: François Charlier <francois.charlier@enovance.com>
Date: Sat, 20 Apr 2013 02:54:31 +0000 (+0200)
Subject: Fix the ceilometer::client class
X-Git-Tag: grizzly-eol~15^2~5
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=83be2ff7da0e0291b7db9129b43b03e361c930d6;p=puppet-modules%2Fpuppet-ceilometer.git

Fix the ceilometer::client class

the client python library is python-ceilometerclient
• fix package name on Debian platforms
• fix Package resource name
---

diff --git a/manifests/client.pp b/manifests/client.pp
index 83588a2..7bb7335 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -10,7 +10,7 @@ class ceilometer::client (
 
   include ceilometer::params
 
-  package { 'python-ceilometer':
+  package { 'python-ceilometerclient':
     ensure => $ensure,
     name   => $::ceilometer::params::client_package_name,
   }
diff --git a/manifests/params.pp b/manifests/params.pp
index e1c70ff..f2a2c1f 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -27,7 +27,7 @@ class ceilometer::params {
       $api_package_name           = 'ceilometer-api'
       $collector_package_name     = 'ceilometer-collector'
       $common_package_name        = 'ceilometer-common'
-      $client_package_name        = 'python-ceilometer'
+      $client_package_name        = 'python-ceilometerclient'
       # service names
       $agent_central_service_name = 'ceilometer-agent-central'
       $agent_compute_service_name = 'ceilometer-agent-compute'
diff --git a/spec/classes/ceilometer_client_spec.rb b/spec/classes/ceilometer_client_spec.rb
index 432f8c1..0da9e1e 100644
--- a/spec/classes/ceilometer_client_spec.rb
+++ b/spec/classes/ceilometer_client_spec.rb
@@ -7,7 +7,7 @@ describe 'ceilometer::client' do
     it { should include_class('ceilometer::params') }
 
     it 'installs ceilometer client package' do
-      should contain_package('python-ceilometer').with(
+      should contain_package('python-ceilometerclient').with(
         :ensure => 'present',
         :name   => platform_params[:client_package_name]
       )
@@ -20,7 +20,7 @@ describe 'ceilometer::client' do
     end
 
     let :platform_params do
-      { :client_package_name => 'python-ceilometer' }
+      { :client_package_name => 'python-ceilometerclient' }
     end
 
     it_configures 'ceilometer client'