From 24526f9dbe854dcd5788ff6cea54c014b056a157 Mon Sep 17 00:00:00 2001
From: zhulingjie <easyzlj@gmail.com>
Date: Thu, 13 Sep 2018 17:05:48 -0400
Subject: [PATCH] Fix the duplicated vars defined

octavia client defined twice, it is unnecessary

Change-Id: I235c08625c7aeb24ef372331192051bac1d8129a
Closes-Bug: #1792606
(cherry picked from commit c65d6ccae484e69987ef2b3bbcfa36a3e380f0a9)
---
 manifests/params.pp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index a77a3559..6d98da4b 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -13,6 +13,7 @@ class octavia::params {
   $worker_service_name         = 'octavia-worker'
   $health_manager_service_name = 'octavia-health-manager'
   $housekeeping_service_name   = 'octavia-housekeeping'
+  $client_package_name         = "python${pyvers}-octaviaclient"
   $group                       = 'octavia'
   case $::osfamily {
     'RedHat': {
@@ -21,7 +22,6 @@ class octavia::params {
       $worker_package_name         = 'openstack-octavia-worker'
       $health_manager_package_name = 'openstack-octavia-health-manager'
       $housekeeping_package_name   = 'openstack-octavia-housekeeping'
-      $client_package_name         = "python${pyvers}-octaviaclient"
       $octavia_wsgi_script_path    = '/var/www/cgi-bin/octavia'
       $octavia_wsgi_script_source  = '/usr/bin/octavia-wsgi'
     }
@@ -31,7 +31,6 @@ class octavia::params {
       $worker_package_name         = 'octavia-worker'
       $health_manager_package_name = 'octavia-health-manager'
       $housekeeping_package_name   = 'octavia-housekeeping'
-      $client_package_name         = "python${pyvers}-octaviaclient"
       $octavia_wsgi_script_path    = '/usr/lib/cgi-bin/octavia'
       $octavia_wsgi_script_source  = '/usr/bin/octavia-wsgi'
     }