Get rid of the $pyvers variable

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

Change-Id: Ic35229b9a5eaefe2b4b9075d02f1ab6bdad791b4

manifests/params.pp

@@ -22,20 +22,17 @@
 class ironic::params {
   include openstacklib::defaults
 
-  $pyvers = $::openstacklib::defaults::pyvers
-  $pyver3 = $::openstacklib::defaults::pyver3
-
   $dbsync_command             =
     'ironic-dbsync --config-file /etc/ironic/ironic.conf'
   $inspector_dbsync_command   =
     'ironic-inspector-dbsync --config-file /etc/ironic-inspector/inspector.conf upgrade'
-  $client_package             = "python${pyvers}-ironicclient"
+  $client_package             = 'python3-ironicclient'
-  $inspector_client_package   = "python${pyvers}-ironic-inspector-client"
+  $inspector_client_package   = 'python3-ironic-inspector-client'
-  $lib_package_name           = "python${pyvers}-ironic-lib"
+  $lib_package_name           = 'python3-ironic-lib'
   $group                      = 'ironic'
-  $sushy_package_name         = "python${pyvers}-sushy"
+  $sushy_package_name         = 'python3-sushy'
-  $proliantutils_package_name = "python${pyvers}-proliantutils"
+  $proliantutils_package_name = 'python3-proliantutils'
-  $dracclient_package_name    = "python${pyvers}-dracclient"
+  $dracclient_package_name    = 'python3-dracclient'
 
   case $::osfamily {
     'RedHat': {

spec/classes/ironic_client_spec.rb

@@ -51,15 +51,7 @@ describe 'ironic::client' do
         when 'Debian'
           { :client_package => 'python3-ironicclient' }
         when 'RedHat'
-          if facts[:operatingsystem] == 'Fedora'
+          { :client_package => 'python3-ironicclient' }
-            { :client_package => 'python3-ironicclient' }
-          else
-            if facts[:operatingsystemmajrelease] > '7'
-              { :client_package => 'python3-ironicclient' }
-            else
-              { :client_package => 'python-ironicclient' }
-            end
-          end
         end
       end
 

spec/classes/ironic_drivers_drac_spec.rb

@@ -46,15 +46,7 @@ describe 'ironic::drivers::drac' do
         when 'Debian'
           { :dracclient_package_name => 'python3-dracclient' }
         when 'RedHat'
-          if facts[:operatingsystem] == 'Fedora'
+          { :dracclient_package_name => 'python3-dracclient' }
-            { :dracclient_package_name => 'python3-dracclient' }
-          else
-            if facts[:operatingsystemmajrelease] > '7'
-              { :dracclient_package_name => 'python3-dracclient' }
-            else
-              { :dracclient_package_name => 'python-dracclient' }
-            end
-          end
         end
       end
 

spec/classes/ironic_drivers_ilo_spec.rb

@@ -71,15 +71,7 @@ describe 'ironic::drivers::ilo' do
         when 'Debian'
           { :proliantutils_package_name => 'python3-proliantutils' }
         when 'RedHat'
-          if facts[:operatingsystem] == 'Fedora'
+          { :proliantutils_package_name => 'python3-proliantutils' }
-            { :proliantutils_package_name => 'python3-proliantutils' }
-          else
-            if facts[:operatingsystemmajrelease] > '7'
-              { :proliantutils_package_name => 'python3-proliantutils' }
-            else
-              { :proliantutils_package_name => 'python-proliantutils' }
-            end
-          end
         end
       end
 

spec/classes/ironic_drivers_redfish_spec.rb

@@ -95,15 +95,7 @@ describe 'ironic::drivers::redfish' do
         when 'Debian'
           { :sushy_package_name => 'python3-sushy' }
         when 'RedHat'
-          if facts[:operatingsystem] == 'Fedora'
+          { :sushy_package_name => 'python3-sushy' }
-            { :sushy_package_name => 'python3-sushy' }
-          else
-            if facts[:operatingsystemmajrelease] > '7'
-              { :sushy_package_name => 'python3-sushy' }
-            else
-              { :sushy_package_name => 'python-sushy' }
-            end
-          end
         end
       end
 

spec/classes/ironic_init_spec.rb

@@ -279,19 +279,8 @@ describe 'ironic' do
           { :common_package_name => 'ironic-common',
             :lib_package_name    => 'python3-ironic-lib' }
         when 'RedHat'
-          if facts[:operatingsystem] == 'Fedora'
+          { :common_package_name => 'openstack-ironic-common',
-            { :common_package_name => 'openstack-ironic-common',
+            :lib_package_name    => 'python3-ironic-lib' }
-              :lib_package_name    => 'python3-ironic-lib' }
-          else
-            if facts[:operatingsystemmajrelease] > '7'
-              { :common_package_name => 'openstack-ironic-common',
-                :lib_package_name    => 'python3-ironic-lib' }
-            else
-              { :common_package_name => 'openstack-ironic-common',
-                :lib_package_name    => 'python-ironic-lib' }
-            end
-          end
-
         end
       end
 

spec/classes/ironic_inspector_client_spec.rb

@@ -56,15 +56,7 @@ describe 'ironic::inspector::client' do
         when 'Debian'
           { :inspector_client_package => 'python3-ironic-inspector-client' }
         when 'RedHat'
-          if facts[:operatingsystem] == 'Fedora'
+          { :inspector_client_package => 'python3-ironic-inspector-client' }
-            { :inspector_client_package => 'python3-ironic-inspector-client' }
-          else
-            if facts[:operatingsystemmajrelease] > '7'
-              { :inspector_client_package => 'python3-ironic-inspector-client' }
-            else
-              { :inspector_client_package => 'python-ironic-inspector-client' }
-            end
-          end
         end
       end