Fix common options position in params.pp

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

Change-Id: I7ff0caf6330a96cff8cbb58427ae2219293d2760

diff --git a/manifests/params.pp b/manifests/params.pp
index a67c44d0a7cb36da01bf7ad7eae7d41991090ba5..1ef5087a38b5cb75fea55c8cfa9cae2ea0df30c9 100644 (file)
--- 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'