Merge "Fix alarm package params for ubuntu havana" into stable/havana

xbezdick · Feb 18, 2014 · 0ad0d4d · 0ad0d4d
2 parents 0c044cb + 619a827
commit 0ad0d4d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -41,7 +41,7 @@
       $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
@@ -19,7 +19,6 @@
     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 @@
     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
@@ -20,7 +20,6 @@
     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 @@
     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