From ed34f375858ec723f2fa9aedbf2d6f1cb9a563a4 Mon Sep 17 00:00:00 2001
From: zhulingjie <easyzlj@gmail.com>
Date: Thu, 13 Sep 2018 18:47:46 -0400
Subject: [PATCH] Fix the duplicated vars defined

Change-Id: I57511901fc9a2ac48473fd53dfd756868f1ae2c9
Closes-Bug: #1792705
---
 manifests/params.pp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index 4ac7926..39fc427 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -2,7 +2,6 @@
 #
 class watcher::params {
   include ::openstacklib::defaults
-  $group = 'watcher'
 
   if ($::os_package_type == 'debian') {
     $pyvers = '3'
@@ -10,6 +9,9 @@ class watcher::params {
     $pyvers = ''
   }
 
+  $client_package_name = "python${pyvers}-watcherclient"
+  $group               = 'watcher'
+
   case $::osfamily {
     'RedHat': {
       $api_service_name             = 'openstack-watcher-api'
@@ -19,7 +21,6 @@ class watcher::params {
       $applier_service_name         = 'openstack-watcher-applier'
       $decision_engine_package_name = 'openstack-watcher-decision-engine'
       $decision_engine_service_name = 'openstack-watcher-decision-engine'
-      $client_package_name          = undef
       $watcher_wsgi_script_source   = '/usr/lib/python2.7/site-packages/watcher/api/app.wsgi'
       $watcher_wsgi_script_path     = '/var/www/cgi-bin/watcher'
     }
@@ -31,7 +32,6 @@ class watcher::params {
       $applier_service_name         = 'watcher-applier'
       $decision_engine_package_name = 'watcher-decision-engine'
       $decision_engine_service_name = 'watcher-decision-engine'
-      $client_package_name          = "python${pyvers}-watcherclient"
       if ($::os_package_type == 'debian') {
         $watcher_wsgi_script_source = '/usr/share/watcher-common/app.wsgi'
       } else {