openstack/puppet-zaqar
Code Issues Proposed changes

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

Browse Source 
Change-Id: Id485d353e40433644dec4f9d8ec18e4124373dce
This commit is contained in:
Takashi Kajinami 2020-04-30 00:19:50 +09:00
parent 16d91fc169
commit 0361fc8964
1 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
spec/classes/zaqar_wsgi_apache_spec.rb
View File

@ -97,12 +97,30 @@ describe 'zaqar::wsgi::apache' do
:wsgi_script_source => '/usr/lib/python3/dist-packages/zaqar/transport/wsgi/app.py' :wsgi_script_source => '/usr/lib/python3/dist-packages/zaqar/transport/wsgi/app.py'
} }
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/zaqar', :httpd_ports_file => '/etc/httpd/conf/ports.conf',
:wsgi_script_source => '/usr/lib/python2.7/site-packages/zaqar/transport/wsgi/app.py' :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
end end
end end