Fix wsgi script path in CentOS8
Change-Id: I8e907966db4a77e419884270652046bd400df9e2
(cherry picked from commit a3a3c7f641
)
This commit is contained in:
parent
d990be268b
commit
ab632d9889
|
@ -5,6 +5,7 @@
|
||||||
class vitrage::params {
|
class vitrage::params {
|
||||||
include openstacklib::defaults
|
include openstacklib::defaults
|
||||||
$pyvers = $::openstacklib::defaults::pyvers
|
$pyvers = $::openstacklib::defaults::pyvers
|
||||||
|
$pyver3 = $::openstacklib::defaults::pyver3
|
||||||
|
|
||||||
$client_package_name = "python${pyvers}-vitrageclient"
|
$client_package_name = "python${pyvers}-vitrageclient"
|
||||||
$group = 'vitrage'
|
$group = 'vitrage'
|
||||||
|
@ -21,7 +22,7 @@ class vitrage::params {
|
||||||
$persistor_package_name = 'openstack-vitrage-persistor'
|
$persistor_package_name = 'openstack-vitrage-persistor'
|
||||||
$persistor_service_name = 'openstack-vitrage-persistor'
|
$persistor_service_name = 'openstack-vitrage-persistor'
|
||||||
$vitrage_wsgi_script_path = '/var/www/cgi-bin/vitrage'
|
$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': {
|
'Debian': {
|
||||||
$common_package_name = 'vitrage-common'
|
$common_package_name = 'vitrage-common'
|
||||||
|
|
|
@ -97,13 +97,30 @@ describe 'vitrage::wsgi::apache' do
|
||||||
:wsgi_script_source => '/usr/share/vitrage-common/app.wsgi'
|
:wsgi_script_source => '/usr/share/vitrage-common/app.wsgi'
|
||||||
}
|
}
|
||||||
when 'RedHat'
|
when 'RedHat'
|
||||||
{
|
if facts[:operatingsystem] == 'Fedora'
|
||||||
:httpd_service_name => 'httpd',
|
{
|
||||||
:httpd_ports_file => '/etc/httpd/conf/ports.conf',
|
:httpd_service_name => 'httpd',
|
||||||
:wsgi_script_path => '/var/www/cgi-bin/vitrage',
|
:httpd_ports_file => '/etc/httpd/conf/ports.conf',
|
||||||
:wsgi_script_source => '/usr/lib/python2.7/site-packages/vitrage/api/app.wsgi'
|
: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
|
||||||
end
|
end
|
||||||
it_configures 'apache serving vitrage with mod_wsgi'
|
it_configures 'apache serving vitrage with mod_wsgi'
|
||||||
|
|
Loading…
Reference in New Issue