openstack/puppet-zaqar
Code Issues Proposed changes

Inherit pyvers from openstacklib::defaults

Browse Source 
Change-Id: Ib6bdfb2f1ac501441fd3b65f336334fc281cef79
This commit is contained in:
Tobias Urdin 2019-01-17 22:10:45 +01:00
parent 222a88ee66
commit 757d6d7349
3 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
manifests/params.pp
View File

@ -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'

6
spec/classes/zaqar_client_spec.rb
View File

@ -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

2
spec/classes/zaqar_wsgi_apache_spec.rb
View File

@ -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'
{