Partially add support for RedHat plateform

diff --git a/manifests/api.pp b/manifests/api.pp
index 54d101b509866850d0fc9ee317a41e7cbf0166e4..3bd551afcf58b5fdd402e303b9f8b6bb8e28fae3 100644 (file)
--- a/manifests/api.pp
+++ b/manifests/api.pp
@@ -16,7 +16,8 @@ class ceilometer::api(
   validate_string($keystone_password)
 
   package { 'ceilometer-api':
-    ensure => installed
+    ensure => installed,
+    name   => $::ceilometer::params::api_package_name,
   }
 
   if $enabled {

diff --git a/manifests/init.pp b/manifests/init.pp
index ec9be19315ad3da7b10457703e5010be77ab371f..4e19fb4fc5d2dc5cbc55d822334977441a900683 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -25,7 +25,7 @@ class ceilometer (
     system  => true,
     require => [
       Group['ceilometer'],
-      Package[$::ceilometer::params::common_package_name]
+      Package['ceilometer-common']
     ],
   }
 

diff --git a/manifests/params.pp b/manifests/params.pp
index a8cf3f27d7c7cb6d51c4f0d0be34795d47e3b054..698ffc0d340f0f9725c3b4baa8d42f1e4ffdcb97 100644 (file)
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -1,24 +1,44 @@
-# Ceilometer::Params class
-#
 #
 class ceilometer::params {
-  $agent_central_package_name = 'ceilometer-agent-central'
-  $agent_compute_package_name = 'ceilometer-agent-compute'
-  $api_package_name           = 'ceilometer-api'
-  $collector_package_name     = 'ceilometer-collector'
-  $common_package_name        = 'ceilometer-common'
-  $client_package_name        = 'python-ceilometer'
-
-  $agent_central_service_name = 'ceilometer-agent-central'
-  $agent_compute_service_name = 'ceilometer-agent-compute'
-  $api_service_name           = 'ceilometer-api'
-  $collector_service_name     = 'ceilometer-collector'
 
-  $dbsync_command             =
-    'ceilometer-dbsync --config-file=/etc/ceilometer/ceilometer.conf'
+  $username       = 'ceilometer'
+  $groupname      = 'ceilometer'
+  $cinder_conf    = '/etc/ceilometer/ceilometer.conf'
+  $dbsync_command = "ceilometer-dbsync --config-file=${cinder_conf}"
+  $log_dir        = '/var/log/ceilometer'
 
-  $log_dir                    = '/var/log/ceilometer'
+  case $::osfamily {
+    'RedHat': {
+      # package names
+      $agent_central_package_name = 'openstack-ceilometer-central'
+      $agent_compute_package_name = 'openstack-ceilometer-compute'
+      $api_package_name           = 'openstack-ceilometer-api'
+      $collector_package_name     = 'openstack-ceilometer-collector'
+      $common_package_name        = 'openstack-ceilometer-common'
+      $client_package_name        = 'python-ceilometerclient'
+      # service names
+      $agent_central_service_name = 'openstack-ceilometer-central'
+      $agent_compute_service_name = 'openstack-ceilometer-compute'
+      $api_service_name           = 'openstack-ceilometer-api'
+      $collector_service_name     = 'openstack-ceilometer-collector'
 
-  $username                   = 'ceilometer'
-  $groupname                  = 'ceilometer'
+    }
+    'Debian': {
+      # package names
+      $agent_central_package_name = 'ceilometer-agent-central'
+      $agent_compute_package_name = 'ceilometer-agent-compute'
+      $api_package_name           = 'ceilometer-api'
+      $collector_package_name     = 'ceilometer-collector'
+      $common_package_name        = 'ceilometer-common'
+      $client_package_name        = 'python-ceilometer'
+      # service names
+      $agent_central_service_name = 'ceilometer-agent-central'
+      $agent_compute_service_name = 'ceilometer-agent-compute'
+      $api_service_name           = 'ceilometer-api'
+      $collector_service_name     = 'ceilometer-collector'
+    }
+    default: {
+      fail("Unsupported osfamily: ${::osfamily} operatingsystem: ${::operatingsystem}, module ${module_name} only support osfamily RedHat and Debian")
+    }
+  }
 }

diff --git a/spec/classes/ceilometer_api_spec.rb b/spec/classes/ceilometer_api_spec.rb
index 37e10b1617cc839a17a28a4942927eb09cd64596..9cee327749798d6b24948a87c75d50191382ac84 100644 (file)
--- a/spec/classes/ceilometer_api_spec.rb
+++ b/spec/classes/ceilometer_api_spec.rb
@@ -17,20 +17,21 @@ describe 'ceilometer::api' do
     }
   end
 
-  context 'with all parameters' do
+  shared_examples_for 'ceilometer-api' do
 
     it { should include_class('ceilometer::params') }
 
     it 'installs ceilometer-api package' do
       should contain_package('ceilometer-api').with(
-        :ensure => 'installed'
+        :ensure => 'installed',
+        :name   => platform_params[:api_package_name]
       )
     end
 
     it 'configures ceilometer-api service' do
       should contain_service('ceilometer-api').with(
         :ensure     => 'running',
-        :name       => 'ceilometer-api',
+        :name       => platform_params[:api_service_name],
         :enable     => true,
         :hasstatus  => true,
         :hasrestart => true,
@@ -39,7 +40,7 @@ describe 'ceilometer::api' do
       )
     end
 
-    it 'configures ceilometer with keystone' do
+    it 'configures keystone authentication middleware' do
       should contain_ceilometer_config('keystone_authtoken/auth_host').with_value( params[:keystone_host] )
       should contain_ceilometer_config('keystone_authtoken/auth_port').with_value( params[:keystone_port] )
       should contain_ceilometer_config('keystone_authtoken/auth_protocol').with_value( params[:keystone_protocol] )
@@ -48,4 +49,30 @@ describe 'ceilometer::api' do
       should contain_ceilometer_config('keystone_authtoken/admin_password').with_value( params[:keystone_password] )
     end
   end
+
+  context 'on Debian platforms' do
+    let :facts do
+      { :osfamily => 'Debian' }
+    end
+
+    let :platform_params do
+      { :api_package_name => 'ceilometer-api',
+        :api_service_name => 'ceilometer-api' }
+    end
+
+    it_configures 'ceilometer-api'
+  end
+
+  context 'on RedHat platforms' do
+    let :facts do
+      { :osfamily => 'RedHat' }
+    end
+
+    let :platform_params do
+      { :api_package_name => 'openstack-ceilometer-api',
+        :api_service_name => 'openstack-ceilometer-api' }
+    end
+
+    it_configures 'ceilometer-api'
+  end
 end

diff --git a/spec/classes/ceilometer_init_spec.rb b/spec/classes/ceilometer_init_spec.rb
index 11a3e46276b0acd2511e022942f5f9f4db8f70ac..eb63c69a18bce271b5284c35199894862e83b50a 100644 (file)
--- a/spec/classes/ceilometer_init_spec.rb
+++ b/spec/classes/ceilometer_init_spec.rb
@@ -15,7 +15,7 @@ describe 'ceilometer' do
     }
   end
 
-  context 'with all parameters' do
+  shared_examples_for 'ceilometer' do
 
     it { should include_class('ceilometer::params') }
 
@@ -42,7 +42,7 @@ describe 'ceilometer' do
         :owner   => 'ceilometer',
         :group   => 'ceilometer',
         :mode    => '0750',
-        :require => ['Package[ceilometer-common]', 'User[ceilometer]']
+        :require => ['Package[ceilometer-common]','User[ceilometer]']
       )
     end
 
@@ -59,7 +59,7 @@ describe 'ceilometer' do
     it 'installs ceilometer common package' do
       should contain_package('ceilometer-common').with(
         :ensure => 'present',
-        :name   => 'ceilometer-common'
+        :name   => platform_params[:common_package_name]
       )
     end
 
@@ -88,4 +88,29 @@ describe 'ceilometer' do
       should contain_ceilometer_config('DEFAULT/notification_topics').with_value('notifications,glance_notifications')
     end
   end
+
+
+  context 'on Debian platforms' do
+    let :facts do
+      {:osfamily => 'Debian'}
+    end
+
+    let :platform_params do
+      { :common_package_name => 'ceilometer-common' }
+    end
+
+    it_configures 'ceilometer'
+  end
+
+  context 'on RedHat platforms' do
+    let :facts do
+      {:osfamily => 'RedHat'}
+    end
+
+    let :platform_params do
+      { :common_package_name => 'openstack-ceilometer-common' }
+    end
+
+    it_configures 'ceilometer'
+  end
 end

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 2c6f56649aeb15c37a49bf07898570e8ab51cf97..e17ce17d648e1b825f2865080be76dc52f4cfb8e 100644 (file)
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1 +1,5 @@
 require 'puppetlabs_spec_helper/module_spec_helper'
+
+RSpec.configure do |c|
+  c.alias_it_should_behave_like_to :it_configures, 'configures'
+end