openstack/puppet-watcher
Code Issues Proposed changes

Expect Python3.6 instead of Python2.7 on CentOS8 and Fedora

Browse Source 
Change-Id: Ic62b0684deea2d9bc3135ee14d3d5d0b4d256b60
This commit is contained in:
Takashi Kajinami
2020-04-30 00:28:28 +09:00
parent 9c0d111497
commit a2251c58e9
1 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
spec/classes/watcher_wsgi_apache_spec.rb
View File

@@ -95,10 +95,24 @@ describe 'watcher::wsgi::apache' do
:wsgi_script_source => '/usr/lib/python3/dist-packages/watcher/api/app.wsgi'
}
when 'RedHat'
{
:wsgi_script_path => '/var/www/cgi-bin/watcher',
:wsgi_script_source => '/usr/lib/python2.7/site-packages/watcher/api/app.wsgi'
}
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
end
end