openstack/puppet-nova
Code Issues Proposed changes

nova/wsgi: change script path

Browse Source 
nova-api-wsgi is now available at /usr/bin/nova-api-wsgi in RDO
packaging so let's use it instead of relying on the python script
in /usr/share like before. UCA will be updated later when the script
is available in packaging.

Change-Id: I426bfdb9e6c852eb32d10a12e521bb8b47701c41
This commit is contained in:
Emilien Macchi
2017-05-16 15:15:26 -04:00
committed by Alex Schultz
parent 06349b5830
commit 5cf1978b79
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/params.pp
View File

@@ -51,7 +51,7 @@ class nova::params {
$lock_path = '/var/lib/nova/tmp'
$nova_log_group = 'nova'
$nova_wsgi_script_path = '/var/www/cgi-bin/nova'
$nova_api_wsgi_script_source = '/usr/lib/python2.7/site-packages/nova/wsgi/nova-api.py'
$nova_api_wsgi_script_source = '/usr/bin/nova-api-wsgi'
$placement_wsgi_script_source = '/usr/bin/nova-placement-api'
$placement_httpd_config_file = '/etc/httpd/conf.d/00-nova-placement-api.conf'
case $::operatingsystem {
@@ -109,6 +109,8 @@ class nova::params {
$tgt_service_name = 'tgt'
$nova_log_group = 'adm'
$nova_wsgi_script_path = '/usr/lib/cgi-bin/nova'
# TODO(aschultz): switch this later when UCA updates their packaging
#$nova_api_wsgi_script_source = '/usr/bin/nova-api-wsgi'
$nova_api_wsgi_script_source = '/usr/lib/python2.7/dist-packages/nova/wsgi/nova-api.py'
$placement_wsgi_script_source = '/usr/bin/nova-placement-api'
$placement_httpd_config_file = '/etc/apache2/sites-available/nova-placement-api.conf'

2
spec/classes/nova_wsgi_apache_api_spec.rb
View File

@@ -172,7 +172,7 @@ describe 'nova::wsgi::apache_api' do
:httpd_service_name => 'httpd',
:httpd_ports_file => '/etc/httpd/conf/ports.conf',
:wsgi_script_path => '/var/www/cgi-bin/nova',
:api_wsgi_script_source => '/usr/lib/python2.7/site-packages/nova/wsgi/nova-api.py',
:api_wsgi_script_source => '/usr/bin/nova-api-wsgi',
}
end
end

2
spec/classes/nova_wsgi_apache_spec.rb
View File

@@ -164,7 +164,7 @@ describe 'nova::wsgi::apache' do
:httpd_service_name => 'httpd',
:httpd_ports_file => '/etc/httpd/conf/ports.conf',
:wsgi_script_path => '/var/www/cgi-bin/nova',
:api_wsgi_script_source => '/usr/lib/python2.7/site-packages/nova/wsgi/nova-api.py',
:api_wsgi_script_source => '/usr/bin/nova-api-wsgi',
}
end
end