From 2a664ba86c9c5debb9c12a866129deb810163edd Mon Sep 17 00:00:00 2001 From: ZhongShengping Date: Tue, 8 Nov 2016 09:45:09 +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: Ib9cb307582ff30f92292daf6bf934fa67ac88e5d --- manifests/params.pp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/manifests/params.pp b/manifests/params.pp index aa7eb1b..11cea65 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -3,6 +3,11 @@ # Parameters for puppet-cloudkitty # class cloudkitty::params { + include ::openstacklib::defaults + + $client_package_name = 'python-cloudkittyclient' + $api_service_name = 'cloudkitty-api' + $processor_service_name = 'cloudkitty-processor' case $::osfamily { 'RedHat': { @@ -11,10 +16,6 @@ class cloudkitty::params { $processor_package_name = 'openstack-cloudkitty-processor' $ui_package_name = 'openstack-cloudkitty-ui' $common_package_name = 'openstack-cloudkitty-common' - $client_package_name = 'python-cloudkittyclient' - # service names - $api_service_name = 'cloudkitty-api' - $processor_service_name = 'cloudkitty-processor' } 'Debian': { # package names @@ -22,10 +23,6 @@ class cloudkitty::params { $processor_package_name = 'cloudkitty-processor' $ui_package_name = 'cloudkitty-dashboard' $common_package_name = 'cloudkitty-common' - $client_package_name = 'python-cloudkittyclient' - # service names - $api_service_name = 'cloudkitty-api' - $processor_service_name = 'cloudkitty-processor' } default: { fail("Unsupported osfamily: ${::osfamily} operatingsystem")