Browse Source

Fix wsgi script path in CentOS8

Change-Id: I8e907966db4a77e419884270652046bd400df9e2
(cherry picked from commit a3a3c7f641)
changes/86/748786/1
Takashi Kajinami 3 weeks ago
parent
commit
ab632d9889
2 changed files with 26 additions and 8 deletions
  1. +2
    -1
      manifests/params.pp
  2. +24
    -7
      spec/classes/vitrage_wsgi_apache_spec.rb

+ 2
- 1
manifests/params.pp View File

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


+ 24
- 7
spec/classes/vitrage_wsgi_apache_spec.rb View File

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


Loading…
Cancel
Save