openstack
/
puppet-ceilometer
Code Issues Proposed changes

Fix common options position in params.pp 

These parameters are common for both systems,
they could be moved out from 'case'.

Change-Id: I7ff0caf6330a96cff8cbb58427ae2219293d2760
This commit is contained in:
ZhongShengping 2016-11-14 11:41:03 +08:00
parent af4af189ea
commit e885bafe57
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
manifests/params.pp
View File

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