openstack/puppet-zaqar
Code Issues Proposed changes

Debian is using Python 3: Fix path to wsgi/app.py

Browse Source 
Use /usr/lib/python3 instead of /usr/lib/python2.7

Change-Id: I79c138bb9baeefc9ed88acdae46c8699b4614884
This commit is contained in:
Thomas Goirand 2018-05-04 10:18:52 +02:00
parent 966c074a47
commit dc2cc876f5
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/params.pp
View File

@ -7,8 +7,10 @@ class zaqar::params {
if ($::os_package_type == 'debian') { if ($::os_package_type == 'debian') {
$pyvers = '3' $pyvers = '3'
$pyver3 = '3'
} else { } else {
$pyvers = '' $pyvers = ''
$pyver3 = '2.7'
} }
$client_package_name = "python${pyvers}-zaqarclient" $client_package_name = "python${pyvers}-zaqarclient"
@ -24,7 +26,7 @@ class zaqar::params {
'Debian': { 'Debian': {
$package_name = 'zaqar-server' $package_name = 'zaqar-server'
$service_name = 'zaqar-server' $service_name = 'zaqar-server'
$zaqar_wsgi_script_source = '/usr/lib/python2.7/dist-packages/zaqar/transport/wsgi/app.py' $zaqar_wsgi_script_source = "/usr/lib/python${pyver3}/dist-packages/zaqar/transport/wsgi/app.py"
$zaqar_wsgi_script_path = '/usr/lib/cgi-bin/zaqar' $zaqar_wsgi_script_path = '/usr/lib/cgi-bin/zaqar'
} }
default: { default: {