openstack
/
puppet-zaqar
Code Issues Proposed changes

Merge "Drop Fedora support"

This commit is contained in:
Zuul 2021-06-19 02:49:23 +00:00 committed by Gerrit Code Review
parent d19b7a08e9 e1b0c4eaa1
commit 8f45dd3781
2 changed files with 10 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
releasenotes/notes/drop-fedora-7ea493ab73fa8a0f.yaml Normal file
View File

@ -0,0 +1,4 @@
---
upgrade:
- |
Fedora is no longer supported.

30
spec/classes/zaqar_wsgi_apache_spec.rb
View File

@ -97,30 +97,12 @@ describe 'zaqar::wsgi::apache' do
:wsgi_script_source => '/usr/lib/python3/dist-packages/zaqar/transport/wsgi/app.py'
}
when 'RedHat'
if facts[:operatingsystem] == 'Fedora'
{
:httpd_service_name => 'httpd',
:httpd_ports_file => '/etc/httpd/conf/ports.conf',
:wsgi_script_path => '/var/www/cgi-bin/zaqar',
:wsgi_script_source => '/usr/lib/python3.6/site-packages/zaqar/transport/wsgi/app.py'
}
else
if facts[:operatingsystemmajrelease] > '7'
{
:httpd_service_name => 'httpd',
:httpd_ports_file => '/etc/httpd/conf/ports.conf',
:wsgi_script_path => '/var/www/cgi-bin/zaqar',
:wsgi_script_source => '/usr/lib/python3.6/site-packages/zaqar/transport/wsgi/app.py'
}
else
{
:httpd_service_name => 'httpd',
:httpd_ports_file => '/etc/httpd/conf/ports.conf',
:wsgi_script_path => '/var/www/cgi-bin/zaqar',
:wsgi_script_source => '/usr/lib/python2.7/site-packages/zaqar/transport/wsgi/app.py'
}
end
end
{
:httpd_service_name => 'httpd',
:httpd_ports_file => '/etc/httpd/conf/ports.conf',
:wsgi_script_path => '/var/www/cgi-bin/zaqar',
:wsgi_script_source => '/usr/lib/python3.6/site-packages/zaqar/transport/wsgi/app.py'
}
end
end