Parameterize cvmfs client package name

attributes/default.rb

-default[:cvmfs][:version] = String.new
-default[:cvmfs][:keys] = Mash.new
+default['cvmfs']['version'] = ''
+default['cvmfs']['keys']    = {}
+
+default['cvmfs']['client']['package'] = 'cvmfs'

recipes/default.rb

@@ -30,7 +30,7 @@ else
   when /^8/
     package 'cvmfs-client'
   when /^9/
-    package 'cvmfs-client'
+    package node['cvmfs']['client']['package']
   else
     log "Platform version #{node[:platform_version]} not supported!" do
       level :warn

test/integration/cernvm-fs/serverspec/localhost/default_spec.rb

 require 'spec_helper'
 
-describe package('cvmfs-client') do
+# TODO: find a good way to determine which variant of CVMFS we have installed
+#  `grep-status -s Package,Status -P cvmfs-release` ???
+# For now:
+if true
+  cvmfs_client_package = 'cvmfs'
+else
+  cvmfs_client_package = 'cvmfs-client'
+end
+
+describe package(cvmfs_client_package) do
   it { should be_installed }
 end