diff --git a/manifests/params.pp b/manifests/params.pp index 6de279c..62c428e 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -5,10 +5,9 @@ class zaqar::params { include openstacklib::defaults - $pyvers = $::openstacklib::defaults::pyvers $pyver3 = $::openstacklib::defaults::pyver3 - $client_package_name = "python${pyvers}-zaqarclient" + $client_package_name = 'python3-zaqarclient' $group = 'zaqar' case $::osfamily { diff --git a/spec/classes/zaqar_client_spec.rb b/spec/classes/zaqar_client_spec.rb index db64f0b..942d671 100644 --- a/spec/classes/zaqar_client_spec.rb +++ b/spec/classes/zaqar_client_spec.rb @@ -31,15 +31,7 @@ describe 'zaqar::client' do when 'Debian' { :client_package_name => 'python3-zaqarclient' } when 'RedHat' - if facts[:operatingsystem] == 'Fedora' - { :client_package_name => 'python3-zaqarclient' } - else - if facts[:operatingsystemmajrelease] > '7' - { :client_package_name => 'python3-zaqarclient' } - else - { :client_package_name => 'python-zaqarclient' } - end - end + { :client_package_name => 'python3-zaqarclient' } end end