nova/wsgi: change script path for ubuntu

nova-api-wsgi is now available at /usr/bin/nova-api-wsgi in UCA
packaging so let's use it.

Change-Id: I012ce89554640a39cda5104e62a0f135ec5e92e1
This commit is contained in:
Emilien Macchi
2017-06-26 10:50:02 -04:00
parent 389d284408
commit 389d0fbd06
3 changed files with 3 additions and 3 deletions

View File

@@ -111,7 +111,7 @@ class nova::params {
$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'
$nova_api_wsgi_script_source = '/usr/bin/nova-api-wsgi'
$placement_wsgi_script_source = '/usr/bin/nova-placement-api'
$placement_httpd_config_file = '/etc/apache2/sites-available/nova-placement-api.conf'
# debian specific nova config

View File

@@ -165,7 +165,7 @@ describe 'nova::wsgi::apache_api' do
:httpd_service_name => 'apache2',
:httpd_ports_file => '/etc/apache2/ports.conf',
:wsgi_script_path => '/usr/lib/cgi-bin/nova',
:api_wsgi_script_source => '/usr/lib/python2.7/dist-packages/nova/wsgi/nova-api.py',
:api_wsgi_script_source => '/usr/bin/nova-api-wsgi',
}
when 'RedHat'
{

View File

@@ -157,7 +157,7 @@ describe 'nova::wsgi::apache' do
:httpd_service_name => 'apache2',
:httpd_ports_file => '/etc/apache2/ports.conf',
:wsgi_script_path => '/usr/lib/cgi-bin/nova',
:api_wsgi_script_source => '/usr/lib/python2.7/dist-packages/nova/wsgi/nova-api.py',
:api_wsgi_script_source => '/usr/bin/nova-api-wsgi',
}
when 'RedHat'
{