From 3c38c6522de80d53a8b0b7d0621f222c12928295 Mon Sep 17 00:00:00 2001 From: Xingchao Yu Date: Thu, 7 Aug 2014 15:05:23 +0800 Subject: [PATCH] Fix ceilometer agent notification package error ceilometer-notification package name should be openstack-ceilometer-notification in RHEL. See more info in related bug tracker record. Change-Id: If64f1ea641c5d99c0adf2104a308c2d5442c3324 Closes-Bug: #1353844 --- manifests/params.pp | 3 +-- spec/classes/ceilometer_agent_notification_spec.rb | 10 +++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/manifests/params.pp b/manifests/params.pp index 1c370ae3..6ddaf2b5 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -13,8 +13,7 @@ class ceilometer::params { $agent_compute_package_name = 'openstack-ceilometer-compute' $api_package_name = 'openstack-ceilometer-api' $collector_package_name = 'openstack-ceilometer-collector' - $agent_notification_package_name = 'openstack-ceilometer-collector' - # notification agent is included in collector package: + $agent_notification_package_name = 'openstack-ceilometer-notification' $alarm_package_name = ['openstack-ceilometer-alarm'] $common_package_name = 'openstack-ceilometer-common' $client_package_name = 'python-ceilometerclient' diff --git a/spec/classes/ceilometer_agent_notification_spec.rb b/spec/classes/ceilometer_agent_notification_spec.rb index f5bfe18e..227b6b6b 100644 --- a/spec/classes/ceilometer_agent_notification_spec.rb +++ b/spec/classes/ceilometer_agent_notification_spec.rb @@ -75,7 +75,7 @@ describe 'ceilometer::agent::notification' do end let :platform_params do - { :agent_notification_package_name => 'openstack-ceilometer-collector', + { :agent_notification_package_name => 'openstack-ceilometer-notification', :agent_notification_service_name => 'openstack-ceilometer-notification' } end @@ -91,7 +91,7 @@ describe 'ceilometer::agent::notification' do end let :platform_params do - { :agent_notification_package_name => 'openstack-ceilometer-collector', + { :agent_notification_package_name => 'openstack-ceilometer-notification', :agent_notification_service_name => 'openstack-ceilometer-notification' } end @@ -107,7 +107,7 @@ describe 'ceilometer::agent::notification' do end let :platform_params do - { :agent_notification_package_name => 'openstack-ceilometer-collector', + { :agent_notification_package_name => 'openstack-ceilometer-notification', :agent_notification_service_name => 'openstack-ceilometer-notification' } end @@ -123,7 +123,7 @@ describe 'ceilometer::agent::notification' do end let :platform_params do - { :agent_notification_package_name => 'openstack-ceilometer-collector', + { :agent_notification_package_name => 'openstack-ceilometer-notification', :agent_notification_service_name => 'openstack-ceilometer-notification' } end @@ -139,7 +139,7 @@ describe 'ceilometer::agent::notification' do end let :platform_params do - { :agent_notification_package_name => 'openstack-ceilometer-collector', + { :agent_notification_package_name => 'openstack-ceilometer-notification', :agent_notification_service_name => 'openstack-ceilometer-notification' } end