openstack/puppet-ceilometer
Code Issues Proposed changes

Merge "Fixes agent_notification_service_name"

Browse Source
This commit is contained in:
Jenkins 2014-06-05 15:42:45 +00:00 committed by Gerrit Code Review
commit c2f41fb1eb
2 changed files with 51 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
manifests/params.pp
View File

@ -23,11 +23,12 @@ class ceilometer::params {
$agent_compute_service_name = 'openstack-ceilometer-compute'
$api_service_name = 'openstack-ceilometer-api'
$collector_service_name = 'openstack-ceilometer-collector'
$agent_notification_service_name = 'openstack-ceilometer-agent-notification'
$alarm_notifier_service_name = 'openstack-ceilometer-alarm-notifier'
$alarm_evaluator_service_name = 'openstack-ceilometer-alarm-evaluator'
$pymongo_package_name = 'python-pymongo'
$psycopg_package_name = 'python-psycopg2'
$agent_notification_service_name = 'openstack-ceilometer-notification'
# db packages
if $::operatingsystem == 'Fedora' and $::operatingsystemrelease >= 18 {
# fallback to stdlib version, not provided on fedora

50
spec/classes/ceilometer_agent_notification_spec.rb
View File

@ -76,7 +76,55 @@ describe 'ceilometer::agent::notification' do
let :platform_params do
{ :agent_notification_package_name => 'openstack-ceilometer-collector',
:agent_notification_service_name => 'openstack-ceilometer-agent-notification' }
:agent_notification_service_name => 'openstack-ceilometer-notification' }
end
it_configures 'ceilometer-agent-notification'
end
context 'on RHEL 7' do
let :facts do
{ :osfamily => 'RedHat',
:operatingsystem => 'RedHat',
:operatingsystemrelease => 7
}
end
let :platform_params do
{ :agent_notification_package_name => 'openstack-ceilometer-collector',
:agent_notification_service_name => 'openstack-ceilometer-notification' }
end
it_configures 'ceilometer-agent-notification'
end
context 'on CentOS 7' do
let :facts do
{ :osfamily => 'RedHat',
:operatingsystem => 'CentOS',
:operatingsystemrelease => 7
}
end
let :platform_params do
{ :agent_notification_package_name => 'openstack-ceilometer-collector',
:agent_notification_service_name => 'openstack-ceilometer-notification' }
end
it_configures 'ceilometer-agent-notification'
end
context 'on Fedora 20' do
let :facts do
{ :osfamily => 'RedHat',
:operatingsystem => 'Fedora',
:operatingsystemrelease => 20
}
end
let :platform_params do
{ :agent_notification_package_name => 'openstack-ceilometer-collector',
:agent_notification_service_name => 'openstack-ceilometer-notification' }
end
it_configures 'ceilometer-agent-notification'