From c0518d8082a290d0688729374f1e7ba199705c82 Mon Sep 17 00:00:00 2001 From: ZhongShengping Date: Mon, 26 Mar 2018 14:06:11 +0800 Subject: [PATCH] Use the pbr generated wsgi binary file located in binary folder Since pbr 1.4.0, wsgi_scripts entrypoing is supported and it will generated a wsgi compatible binary file. Not yet supported on Debian systems. Change-Id: Ie9b0fe1b7923dbf68db665982eb6003c83c0b4a8 --- manifests/params.pp | 2 +- spec/classes/aodh_wsgi_apache_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/manifests/params.pp b/manifests/params.pp index df852c10..fe1ed8ea 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -24,7 +24,7 @@ class aodh::params { $listener_package_name = 'openstack-aodh-listener' $listener_service_name = 'openstack-aodh-listener' $aodh_wsgi_script_path = '/var/www/cgi-bin/aodh' - $aodh_wsgi_script_source = '/usr/lib/python2.7/site-packages/aodh/api/app.wsgi' + $aodh_wsgi_script_source = '/usr/bin/aodh-api' $redis_package_name = 'python-redis' } 'Debian': { diff --git a/spec/classes/aodh_wsgi_apache_spec.rb b/spec/classes/aodh_wsgi_apache_spec.rb index 85097e6c..64e2bed3 100644 --- a/spec/classes/aodh_wsgi_apache_spec.rb +++ b/spec/classes/aodh_wsgi_apache_spec.rb @@ -101,7 +101,7 @@ describe 'aodh::wsgi::apache' do :httpd_service_name => 'httpd', :httpd_ports_file => '/etc/httpd/conf/ports.conf', :wsgi_script_path => '/var/www/cgi-bin/aodh', - :wsgi_script_source => '/usr/lib/python2.7/site-packages/aodh/api/app.wsgi' + :wsgi_script_source => '/usr/bin/aodh-api' } end