openstack/puppet-zaqar
Code Issues Proposed changes

Install python3-zaqarclient in Fedora or RedHat > 7

Browse Source 
Fedora repo [1] has python3 packages, start consuming those.

[1] http://trunk.rdoproject.org/fedora/puppet-passed-ci/

Also adjust wsgi script path for Fedora or RedHat > 7.

Change-Id: I391016f145a430d98d079d790d6bb8b5b68a3205
This commit is contained in:
yatin 2018-10-26 23:46:06 +05:30
parent 1f29023244
commit 243a91209e
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/params.pp
View File

@ -8,6 +8,10 @@ class zaqar::params {
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'
@ -20,7 +24,7 @@ class zaqar::params {
'RedHat': {
$package_name = 'openstack-zaqar'
$service_name = 'openstack-zaqar'
$zaqar_wsgi_script_source = '/usr/lib/python2.7/site-packages/zaqar/transport/wsgi/app.py'
$zaqar_wsgi_script_source = "/usr/lib/python${pyver3}/site-packages/zaqar/transport/wsgi/app.py"
$zaqar_wsgi_script_path = '/var/www/cgi-bin/zaqar'
}
'Debian': {