From ab632d98897ab37ac29af5eabf6994f5721aa79e Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Thu, 27 Aug 2020 21:27:09 +0900
Subject: [PATCH] Fix wsgi script path in CentOS8

Change-Id: I8e907966db4a77e419884270652046bd400df9e2
(cherry picked from commit a3a3c7f641cfa588ed2fa7282aab8e1efa847408)
---
 manifests/params.pp                      |  3 ++-
 spec/classes/vitrage_wsgi_apache_spec.rb | 31 ++++++++++++++++++------
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index 50a2228..8904888 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -5,6 +5,7 @@
 class vitrage::params {
   include openstacklib::defaults
   $pyvers = $::openstacklib::defaults::pyvers
+  $pyver3 = $::openstacklib::defaults::pyver3
 
   $client_package_name = "python${pyvers}-vitrageclient"
   $group               = 'vitrage'
@@ -21,7 +22,7 @@ class vitrage::params {
       $persistor_package_name      = 'openstack-vitrage-persistor'
       $persistor_service_name      = 'openstack-vitrage-persistor'
       $vitrage_wsgi_script_path    = '/var/www/cgi-bin/vitrage'
-      $vitrage_wsgi_script_source  = '/usr/lib/python2.7/site-packages/vitrage/api/app.wsgi'
+      $vitrage_wsgi_script_source  = "/usr/lib/python${pyver3}/site-packages/vitrage/api/app.wsgi"
     }
     'Debian': {
       $common_package_name         = 'vitrage-common'
diff --git a/spec/classes/vitrage_wsgi_apache_spec.rb b/spec/classes/vitrage_wsgi_apache_spec.rb
index 6872d1f..718660b 100644
--- a/spec/classes/vitrage_wsgi_apache_spec.rb
+++ b/spec/classes/vitrage_wsgi_apache_spec.rb
@@ -97,13 +97,30 @@ describe 'vitrage::wsgi::apache' do
             :wsgi_script_source => '/usr/share/vitrage-common/app.wsgi'
           }
         when 'RedHat'
-          {
-            :httpd_service_name => 'httpd',
-            :httpd_ports_file   => '/etc/httpd/conf/ports.conf',
-            :wsgi_script_path   => '/var/www/cgi-bin/vitrage',
-            :wsgi_script_source => '/usr/lib/python2.7/site-packages/vitrage/api/app.wsgi'
-          }
-
+          if facts[:operatingsystem] == 'Fedora'
+            {
+              :httpd_service_name => 'httpd',
+              :httpd_ports_file   => '/etc/httpd/conf/ports.conf',
+              :wsgi_script_path   => '/var/www/cgi-bin/vitrage',
+              :wsgi_script_source => '/usr/lib/python3.6/site-packages/vitrage/api/app.wsgi'
+            }
+          else
+            if facts[:operatingsystemmajrelease] > '7'
+              {
+                :httpd_service_name => 'httpd',
+                :httpd_ports_file   => '/etc/httpd/conf/ports.conf',
+                :wsgi_script_path   => '/var/www/cgi-bin/vitrage',
+                :wsgi_script_source => '/usr/lib/python3.6/site-packages/vitrage/api/app.wsgi'
+              }
+            else
+              {
+                :httpd_service_name => 'httpd',
+                :httpd_ports_file   => '/etc/httpd/conf/ports.conf',
+                :wsgi_script_path   => '/var/www/cgi-bin/vitrage',
+                :wsgi_script_source => '/usr/lib/python2.7/site-packages/vitrage/api/app.wsgi'
+              }
+            end
+          end
         end
       end
       it_configures 'apache serving vitrage with mod_wsgi'