openstack/puppet-ceilometer
Code Issues Proposed changes

Merge "Fix common options position in params.pp"

Browse Source
This commit is contained in:
Jenkins 2016-11-17 08:56:28 +00:00 committed by Gerrit Code Review
commit 69931b0685
1 changed files with 5 additions and 6 deletions

11
manifests/params.pp

@ -6,10 +6,11 @@
class ceilometer::params { class ceilometer::params {
include ::openstacklib::defaults include ::openstacklib::defaults
$dbsync_command = 'ceilometer-upgrade --config-file=/etc/ceilometer/ceilometer.conf --skip-gnocchi-resource-types' $dbsync_command = 'ceilometer-upgrade --config-file=/etc/ceilometer/ceilometer.conf --skip-gnocchi-resource-types'
$expirer_command = 'ceilometer-expirer' $expirer_command = 'ceilometer-expirer'
$user = 'ceilometer' $user = 'ceilometer'
$event_pipeline = '/etc/ceilometer/event_pipeline.yaml' $event_pipeline = '/etc/ceilometer/event_pipeline.yaml'
$client_package_name = 'python-ceilometerclient'
case $::osfamily { case $::osfamily {
'RedHat': { 'RedHat': {
@ -21,7 +22,6 @@ class ceilometer::params {
$collector_package_name = 'openstack-ceilometer-collector' $collector_package_name = 'openstack-ceilometer-collector'
$agent_notification_package_name = 'openstack-ceilometer-notification' $agent_notification_package_name = 'openstack-ceilometer-notification'
$common_package_name = 'openstack-ceilometer-common' $common_package_name = 'openstack-ceilometer-common'
$client_package_name = 'python-ceilometerclient'
# service names # service names
$agent_central_service_name = 'openstack-ceilometer-central' $agent_central_service_name = 'openstack-ceilometer-central'
$agent_compute_service_name = 'openstack-ceilometer-compute' $agent_compute_service_name = 'openstack-ceilometer-compute'
@ -42,7 +42,6 @@ class ceilometer::params {
$collector_package_name = 'ceilometer-collector' $collector_package_name = 'ceilometer-collector'
$agent_notification_package_name = 'ceilometer-agent-notification' $agent_notification_package_name = 'ceilometer-agent-notification'
$common_package_name = 'ceilometer-common' $common_package_name = 'ceilometer-common'
$client_package_name = 'python-ceilometerclient'
# service names # service names
$agent_central_service_name = 'ceilometer-agent-central' $agent_central_service_name = 'ceilometer-agent-central'
$agent_compute_service_name = 'ceilometer-agent-compute' $agent_compute_service_name = 'ceilometer-agent-compute'