From 68b83d31bb0ec827e12b9528263d8ce589490cb5 Mon Sep 17 00:00:00 2001
From: Thomas Goirand <zigo@debian.org>
Date: Fri, 21 May 2021 10:42:42 +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: Ibf93bdbf3c9e2985108f7ebb84de541ac2bb3a67
---
 manifests/params.pp                  |  3 +--
 spec/classes/barbican_client_spec.rb | 10 +---------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index f841adb7..125c9720 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -4,9 +4,8 @@
 #
 class barbican::params {
   include openstacklib::defaults
-  $pyvers = $::openstacklib::defaults::pyvers
 
-  $client_package_name   = "python${pyvers}-barbicanclient"
+  $client_package_name   = 'python3-barbicanclient'
   $group                 = 'barbican'
   $dogtag_client_package = 'pki-base'
 
diff --git a/spec/classes/barbican_client_spec.rb b/spec/classes/barbican_client_spec.rb
index 24e770bb..a1082124 100644
--- a/spec/classes/barbican_client_spec.rb
+++ b/spec/classes/barbican_client_spec.rb
@@ -63,15 +63,7 @@ describe 'barbican::client' do
         when 'Debian'
           { :client_package_name => 'python3-barbicanclient' }
         when 'RedHat'
-          if facts[:operatingsystem] == 'Fedora'
-            { :client_package_name => 'python3-barbicanclient' }
-          else
-            if facts[:operatingsystemmajrelease] > '7'
-              { :client_package_name => 'python3-barbicanclient' }
-            else
-              { :client_package_name => 'python-barbicanclient' }
-            end
-          end
+          { :client_package_name => 'python3-barbicanclient' }
         end
       end