diff --git a/manifests/params.pp b/manifests/params.pp
index 64059491..d8f16e87 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -5,13 +5,7 @@
 class manila::params {
 
   include ::openstacklib::defaults
-
-  if ($::os_package_type == 'debian') or ($::os['name'] == 'Fedora') or
-    ($::os['family'] == 'RedHat' and Integer.new($::os['release']['major']) > 7) {
-    $pyvers = '3'
-  } else {
-    $pyvers = ''
-  }
+  $pyvers = $::openstacklib::defaults::pyvers
 
   $client_package       = "python${pyvers}-manilaclient"
   $db_sync_command      = 'manila-manage db sync'
diff --git a/spec/classes/manila_client_spec.rb b/spec/classes/manila_client_spec.rb
index f072de51..615f187b 100644
--- a/spec/classes/manila_client_spec.rb
+++ b/spec/classes/manila_client_spec.rb
@@ -27,11 +27,7 @@ describe 'manila::client' do
       let :platform_params do
         case facts[:osfamily]
         when 'Debian'
-          if facts[:os_package_type] == 'debian'
-            { :client_package => 'python3-manilaclient' }
-          else
-            { :client_package => 'python-manilaclient' }
-          end
+          { :client_package => 'python3-manilaclient' }
         when 'RedHat'
           { :client_package => 'python-manilaclient' }
         end