From 619a8271563c37351f7c08fa6bf0304888d0a667 Mon Sep 17 00:00:00 2001 From: Pradeep Kilambi Date: Thu, 6 Feb 2014 17:47:51 -0500 Subject: [PATCH] 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 --- manifests/params.pp | 2 +- spec/classes/ceilometer_alarm_evaluator_spec.rb | 3 +-- spec/classes/ceilometer_alarm_notifier_spec.rb | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/manifests/params.pp b/manifests/params.pp index c240bb9da..04b15e902 100644 --- 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 index d017695e9..82dc495db 100644 --- 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 index 6c40d433a..f07bfe0df 100644 --- 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