openstack
/
puppet-gnocchi
Code Issues Proposed changes

Use gnocchi-api binary for wsgi script 

WSGI script gnocchi/rest/app.wsgi has been removed in [1] which has
been included in release 4.1.0 and gnocchi-api must be used instead [2].

Note that new version has been bumped in RDO but not ubuntu yet, so
this patch is switching the wsgi script only for Red Hat deployments.

[1] cef3396908 (diff-f6608875dec4d7646c38d649181fd350)
[2] 176c1332f6/releasenotes/notes/wsgi-script-deprecation-c6753a844ca0b411.yaml

Change-Id: Ibf901844e8319eec9c60f7c5c27770c89aae6427
Closes-Bug: #1735118
This commit is contained in:
Alfredo Moralejo 2017-11-29 10:29:27 +01:00
parent eff2da1ea4
commit 274b8f39ac
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/params.pp
View File

@ -20,7 +20,7 @@ class gnocchi::params {
$statsd_package_name = 'openstack-gnocchi-statsd'
$statsd_service_name = 'openstack-gnocchi-statsd'
$gnocchi_wsgi_script_path = '/var/www/cgi-bin/gnocchi'
$gnocchi_wsgi_script_source = '/usr/lib/python2.7/site-packages/gnocchi/rest/app.wsgi'
$gnocchi_wsgi_script_source = '/usr/bin/gnocchi-api'
$pymysql_package_name = undef
$cradox_package_name = 'python2-cradox'
$redis_package_name = 'python-redis'

2
spec/classes/gnocchi_wsgi_apache_spec.rb
View File

@ -103,7 +103,7 @@ describe 'gnocchi::wsgi::apache' do
:httpd_service_name => 'httpd',
:httpd_ports_file => '/etc/httpd/conf/ports.conf',
:wsgi_script_path => '/var/www/cgi-bin/gnocchi',
:wsgi_script_source => '/usr/lib/python2.7/site-packages/gnocchi/rest/app.wsgi'
:wsgi_script_source => '/usr/bin/gnocchi-api'
}
end
end