From 243a91209e8d60183e35598f9cc109096dff8a25 Mon Sep 17 00:00:00 2001 From: yatin Date: Fri, 26 Oct 2018 23:46:06 +0530 Subject: [PATCH] Install python3-zaqarclient in Fedora or RedHat > 7 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 --- manifests/params.pp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/manifests/params.pp b/manifests/params.pp index 4eaac26..d084855 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -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': {