From 274b8f39acb23c5aa8b49684f405d8ae385de111 Mon Sep 17 00:00:00 2001 From: Alfredo Moralejo Date: Wed, 29 Nov 2017 10:29:27 +0100 Subject: [PATCH] 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] https://github.com/gnocchixyz/gnocchi/commit/cef3396908947b6a8437476c899e6d5cec48a6d5#diff-f6608875dec4d7646c38d649181fd350 [2] https://github.com/gnocchixyz/gnocchi/blob/176c1332f6279dfa3a8238c9e017769553e59f02/releasenotes/notes/wsgi-script-deprecation-c6753a844ca0b411.yaml Change-Id: Ibf901844e8319eec9c60f7c5c27770c89aae6427 Closes-Bug: #1735118 --- manifests/params.pp | 2 +- spec/classes/gnocchi_wsgi_apache_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/manifests/params.pp b/manifests/params.pp index eb4687eb..2aaff79f 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -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' diff --git a/spec/classes/gnocchi_wsgi_apache_spec.rb b/spec/classes/gnocchi_wsgi_apache_spec.rb index 228c2834..412d1422 100644 --- a/spec/classes/gnocchi_wsgi_apache_spec.rb +++ b/spec/classes/gnocchi_wsgi_apache_spec.rb @@ -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