openstack
/
puppet-watcher
Code Issues Proposed changes

Merge "Drop Fedora support"

This commit is contained in:
Zuul 2021-06-19 02:51:32 +00:00 committed by Gerrit Code Review
parent a41ebbc11a db032d6829
commit 5ececf2909
3 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
metadata.json
View File

@ -33,12 +33,6 @@
"9"
]
},
{
"operatingsystem": "Fedora",
"operatingsystemrelease": [
"24"
]
},
{
"operatingsystem": "RedHat",
"operatingsystemrelease": [

4
releasenotes/notes/drop-fedora-56709758aa310b8d.yaml Normal file
View File

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

22
spec/classes/watcher_wsgi_apache_spec.rb
View File

@ -95,24 +95,10 @@ describe 'watcher::wsgi::apache' do
:wsgi_script_source => '/usr/lib/python3/dist-packages/watcher/api/app.wsgi'
}
when 'RedHat'
if facts[:operatingsystem] == 'Fedora'
{
:wsgi_script_path => '/var/www/cgi-bin/watcher',
:wsgi_script_source => '/usr/lib/python3.6/site-packages/watcher/api/app.wsgi'
}
else
if facts[:operatingsystemmajrelease] > '7'
{
:wsgi_script_path => '/var/www/cgi-bin/watcher',
:wsgi_script_source => '/usr/lib/python3.6/site-packages/watcher/api/app.wsgi'
}
else
{
:wsgi_script_path => '/var/www/cgi-bin/watcher',
:wsgi_script_source => '/usr/lib/python2.7/site-packages/watcher/api/app.wsgi'
}
end
end
{
:wsgi_script_path => '/var/www/cgi-bin/watcher',
:wsgi_script_source => '/usr/lib/python3.6/site-packages/watcher/api/app.wsgi'
}
end
end