diff --git a/manifests/params.pp b/manifests/params.pp index d084855..d021b70 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -5,17 +5,8 @@ class zaqar::params { include ::openstacklib::defaults - if ($::os_package_type == 'debian') { - $pyvers = '3' - $pyver3 = '3' - } elsif ($::os['name'] == 'Fedora') or - ($::os['family'] == 'RedHat' and Integer.new($::os['release']['major']) > 7) { - $pyvers = '3' - $pyver3 = '3.6' - } else { - $pyvers = '' - $pyver3 = '2.7' - } + $pyvers = $::openstacklib::defaults::pyvers + $pyver3 = $::openstacklib::defaults::pyver3 $client_package_name = "python${pyvers}-zaqarclient" $group = 'zaqar' diff --git a/spec/classes/zaqar_client_spec.rb b/spec/classes/zaqar_client_spec.rb index 81b6779..8d18ab6 100644 --- a/spec/classes/zaqar_client_spec.rb +++ b/spec/classes/zaqar_client_spec.rb @@ -27,11 +27,7 @@ describe 'zaqar::client' do let(:platform_params) do case facts[:osfamily] when 'Debian' - if facts[:os_package_type] == 'debian' - { :client_package_name => 'python3-zaqarclient' } - else - { :client_package_name => 'python-zaqarclient' } - end + { :client_package_name => 'python3-zaqarclient' } when 'RedHat' { :client_package_name => 'python-zaqarclient' } end diff --git a/spec/classes/zaqar_wsgi_apache_spec.rb b/spec/classes/zaqar_wsgi_apache_spec.rb index 817e54a..a1e2958 100644 --- a/spec/classes/zaqar_wsgi_apache_spec.rb +++ b/spec/classes/zaqar_wsgi_apache_spec.rb @@ -94,7 +94,7 @@ describe 'zaqar::wsgi::apache' do :httpd_service_name => 'apache2', :httpd_ports_file => '/etc/apache2/ports.conf', :wsgi_script_path => '/usr/lib/cgi-bin/zaqar', - :wsgi_script_source => '/usr/lib/python2.7/dist-packages/zaqar/transport/wsgi/app.py' + :wsgi_script_source => '/usr/lib/python3/dist-packages/zaqar/transport/wsgi/app.py' } when 'RedHat' {