From d727cf872fb7d8cfa05ddb994d65ef614390a751 Mon Sep 17 00:00:00 2001
From: ZhongShengping <chdzsp@163.com>
Date: Tue, 8 Nov 2016 10:05:42 +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: Ic07c62593d63190b523efcc3f020cba12b5001f3
---
 manifests/params.pp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index cec77347..4dab153b 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -5,6 +5,8 @@
 class heat::params {
   include ::openstacklib::defaults
 
+  $client_package_name         = 'python-heatclient'
+
   case $::osfamily {
     'RedHat': {
       # package names
@@ -12,7 +14,6 @@ class heat::params {
       $api_cloudwatch_package_name = 'openstack-heat-api-cloudwatch'
       $api_cfn_package_name        = 'openstack-heat-api-cfn'
       $engine_package_name         = 'openstack-heat-engine'
-      $client_package_name         = 'python-heatclient'
       $common_package_name         = 'openstack-heat-common'
       # service names
       $api_service_name            = 'openstack-heat-api'
@@ -26,7 +27,6 @@ class heat::params {
       $api_cloudwatch_package_name = 'heat-api-cloudwatch'
       $api_cfn_package_name        = 'heat-api-cfn'
       $engine_package_name         = 'heat-engine'
-      $client_package_name         = 'python-heatclient'
       $common_package_name         = 'heat-common'
       # service names
       $api_service_name            = 'heat-api'