From 64e22c62713d0bf96694e1e9bd80850f565261e3 Mon Sep 17 00:00:00 2001
From: zhulingjie <easyzlj@gmail.com>
Date: Thu, 13 Sep 2018 17:39:25 -0400
Subject: [PATCH] Optimise the nova client vars defined

nova client defined twice, it is unnecessary

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

diff --git a/manifests/params.pp b/manifests/params.pp
index 49cfc9ae8..c4f220e3e 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -4,16 +4,17 @@
 # should be considered to be constant
 class nova::params {
   include ::openstacklib::defaults
-  $group = 'nova'
   if ($::os_package_type == 'debian') or ($::operatingsystem == 'Fedora') {
     $pyvers = '3'
   } else {
     $pyvers = ''
   }
+  $client_package = "python${pyvers}-novaclient"
+  $group          = 'nova'
+
   case $::osfamily {
     'RedHat': {
       # package names
-      $client_package                    = "python${pyvers}-novaclient"
       $api_package_name                  = 'openstack-nova-api'
       $placement_package_name            = 'openstack-nova-placement-api'
       $cells_package_name                = 'openstack-nova-cells'
@@ -89,7 +90,6 @@ class nova::params {
     }
     'Debian': {
       # package names
-      $client_package                    = "python${pyvers}-novaclient"
       $api_package_name                  = 'nova-api'
       $placement_package_name            = 'nova-placement-api'
       $cells_package_name                = 'nova-cells'