diff --git a/manifests/params.pp b/manifests/params.pp index 75bc629c..c4ca7e96 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -4,9 +4,8 @@ # class cinder::params { include openstacklib::defaults - $pyvers = $::openstacklib::defaults::pyvers - $client_package = "python${pyvers}-cinderclient" + $client_package = 'python3-cinderclient' $group = 'cinder' $cinder_wsgi_script_source = '/usr/bin/cinder-wsgi' diff --git a/spec/classes/cinder_client_spec.rb b/spec/classes/cinder_client_spec.rb index ed4d5e6f..c42fff85 100644 --- a/spec/classes/cinder_client_spec.rb +++ b/spec/classes/cinder_client_spec.rb @@ -43,15 +43,7 @@ describe 'cinder::client' do when 'Debian' { :client_package_name => 'python3-cinderclient' } when 'RedHat' - if facts[:operatingsystem] == 'Fedora' - { :client_package_name => 'python3-cinderclient' } - else - if facts[:operatingsystemmajrelease] > '7' - { :client_package_name => 'python3-cinderclient' } - else - { :client_package_name => 'python-cinderclient' } - end - end + { :client_package_name => 'python3-cinderclient' } end end