From 508fc7addeeb5c09e58b556847e988a88df9ff13 Mon Sep 17 00:00:00 2001
From: Thomas Goirand <zigo@debian.org>
Date: Wed, 9 Jun 2021 16:20:08 +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: I371ef3a2e257e6d197238e7e9cbfd9d445405be5
---
 manifests/defaults.pp                             | 5 -----
 manifests/params.pp                               | 3 +--
 spec/classes/openstacklib_openstackclient_spec.rb | 6 +-----
 3 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/manifests/defaults.pp b/manifests/defaults.pp
index 87a2f33d..753ff971 100644
--- a/manifests/defaults.pp
+++ b/manifests/defaults.pp
@@ -7,23 +7,18 @@
 class openstacklib::defaults {
 
   if ($::os['family'] == 'Debian') {
-    $pyvers = '3'
     $pyver3 = '3'
   } elsif $::os['family'] == 'RedHat' {
     if Integer.new($::os['release']['major']) > 8 {
-      $pyvers = '3'
       $pyver3 = '3.9'
     } elsif Integer.new($::os['release']['major']) == 8 {
-      $pyvers = '3'
       $pyver3 = '3.6'
     } else {
-      $pyvers = ''
       $pyver3 = '2.7'
     }
   } else {
     # TODO(tkajinam) This is left to keep the previous behavior but we should
     #                revisit this later.
-    $pyvers = ''
     $pyver3 = '2.7'
   }
 }
diff --git a/manifests/params.pp b/manifests/params.pp
index 7ce9482d..0f4c85a8 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -6,9 +6,8 @@
 class openstacklib::params {
 
   include openstacklib::defaults
-  $pyvers = $::openstacklib::defaults::pyvers
 
-  $openstackclient_package_name = "python${pyvers}-openstackclient"
+  $openstackclient_package_name = 'python3-openstackclient'
 
   case $::osfamily {
     'RedHat': {
diff --git a/spec/classes/openstacklib_openstackclient_spec.rb b/spec/classes/openstacklib_openstackclient_spec.rb
index c592800d..e305e243 100644
--- a/spec/classes/openstacklib_openstackclient_spec.rb
+++ b/spec/classes/openstacklib_openstackclient_spec.rb
@@ -36,11 +36,7 @@ describe 'openstacklib::openstackclient' do
         when 'Debian'
           { :openstackclient_package_name => 'python3-openstackclient' }
         when 'RedHat'
-          if facts[:operatingsystemmajrelease] > '7'
-            { :openstackclient_package_name => 'python3-openstackclient' }
-          else
-            { :openstackclient_package_name => 'python-openstackclient' }
-          end
+          { :openstackclient_package_name => 'python3-openstackclient' }
         end
       end