From e885bafe5789be7ea57c40320183178f9e24d9e0 Mon Sep 17 00:00:00 2001 From: ZhongShengping Date: Mon, 14 Nov 2016 11:41:03 +0800 Subject: [PATCH] Fix common options position in params.pp These parameters are common for both systems, they could be moved out from 'case'. Change-Id: I7ff0caf6330a96cff8cbb58427ae2219293d2760 --- manifests/params.pp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/manifests/params.pp b/manifests/params.pp index a67c44d0..1ef5087a 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -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'