Fix alarm package params for ubuntu havana

The alarm-notifier and alarm-evaluator are
still part of ceilometer-common for havana ubuntu
packaging. The new packaging split is only available
for icehouse

Change-Id: I91098bd3f13ee4391dcf1b870705c0a0c5566acc

diff --git a/manifests/params.pp b/manifests/params.pp
index c240bb9da90ef613ce660755d4f3130214c576e5..04b15e902858cf41eb94e9718dfb24e8e6d88b84 100644 (file)
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -41,7 +41,7 @@ class ceilometer::params {
       $collector_package_name       = 'ceilometer-collector'
       $common_package_name          = 'ceilometer-common'
       $client_package_name          = 'python-ceilometerclient'
-      $alarm_package_name           = ['ceilometer-alarm-notifier','ceilometer-alarm-evaluator']
+      $alarm_package_name           = ['ceilometer-common']
       # service names
       $agent_central_service_name   = 'ceilometer-agent-central'
       $agent_compute_service_name   = 'ceilometer-agent-compute'

diff --git a/spec/classes/ceilometer_alarm_evaluator_spec.rb b/spec/classes/ceilometer_alarm_evaluator_spec.rb
index d017695e990020f1d3805e3725f0c05b879f8c88..82dc495db006896c0b5a864f450942f513d58679 100644 (file)
--- a/spec/classes/ceilometer_alarm_evaluator_spec.rb
+++ b/spec/classes/ceilometer_alarm_evaluator_spec.rb
@@ -19,7 +19,6 @@ describe 'ceilometer::alarm::evaluator' do
     it { should contain_class('ceilometer::params') }
 
     it 'installs ceilometer-alarm package' do
-      should contain_package(platform_params[:alarm_evaluator_package_name]).with_before('Service[ceilometer-alarm-evaluator]')
       should contain_package(platform_params[:alarm_evaluator_package_name]).with(
         :ensure => 'present',
         :name   => platform_params[:alarm_evaluator_package_name]
@@ -79,7 +78,7 @@ describe 'ceilometer::alarm::evaluator' do
     end
 
     let :platform_params do
-      { :alarm_evaluator_package_name => 'ceilometer-alarm-evaluator',
+      { :alarm_evaluator_package_name => 'ceilometer-common',
         :alarm_evaluator_service_name => 'ceilometer-alarm-evaluator' }
     end
 

diff --git a/spec/classes/ceilometer_alarm_notifier_spec.rb b/spec/classes/ceilometer_alarm_notifier_spec.rb
index 6c40d433a019e6d262c9347b188bfde75bcbd7c0..f07bfe0dfadaf51240940f9ba4d56e8c2780bb4a 100644 (file)
--- a/spec/classes/ceilometer_alarm_notifier_spec.rb
+++ b/spec/classes/ceilometer_alarm_notifier_spec.rb
@@ -20,7 +20,6 @@ describe 'ceilometer::alarm::notifier' do
     it { should contain_class('ceilometer::params') }
 
     it 'installs ceilometer-alarm package' do
-      should contain_package(platform_params[:alarm_notifier_package_name]).with_before('Service[ceilometer-alarm-notifier]')
       should contain_package(platform_params[:alarm_notifier_package_name]).with(
         :ensure => 'present',
         :name   => platform_params[:alarm_notifier_package_name]
@@ -72,7 +71,7 @@ describe 'ceilometer::alarm::notifier' do
     end
 
     let :platform_params do
-      { :alarm_notifier_package_name => 'ceilometer-alarm-notifier',
+      { :alarm_notifier_package_name => 'ceilometer-common',
         :alarm_notifier_service_name => 'ceilometer-alarm-notifier' }
     end