From ae0a25f1ed02ac6ed9a875f70478810e2ba91e24 Mon Sep 17 00:00:00 2001
From: Thomas Goirand <zigo@debian.org>
Date: Mon, 14 Jun 2021 09:48:29 +0200
Subject: [PATCH] Get rid of the $pyvers variable

Since everyone has switched to Python3, it's time for the removal of the
$pyvers variable.

Change-Id: I0dd38974a07d76b003688c57258aaa37a8b6ed32
---
 manifests/params.pp                |  3 +--
 spec/classes/tacker_client_spec.rb | 10 +---------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index 2710275..3c9dce6 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -2,10 +2,9 @@
 #
 class tacker::params {
   include openstacklib::defaults
-  $pyvers = $::openstacklib::defaults::pyvers
 
   $group = 'tacker'
-  $client_package_name = "python${pyvers}-tackerclient"
+  $client_package_name = 'python3-tackerclient'
 
   case $::osfamily {
     'RedHat': {
diff --git a/spec/classes/tacker_client_spec.rb b/spec/classes/tacker_client_spec.rb
index 9b3f42c..e17f8c6 100644
--- a/spec/classes/tacker_client_spec.rb
+++ b/spec/classes/tacker_client_spec.rb
@@ -33,15 +33,7 @@ describe 'tacker::client' do
         when 'Debian'
           { :client_package_name => 'python3-tackerclient' }
         when 'RedHat'
-          if facts[:operatingsystem] == 'Fedora'
-            { :client_package_name => 'python3-tackerclient' }
-          else
-            if facts[:operatingsystemmajrelease] > '7'
-              { :client_package_name => 'python3-tackerclient' }
-            else
-              { :client_package_name => 'python-tackerclient' }
-            end
-          end
+          { :client_package_name => 'python3-tackerclient' }
         end
       end