openstack/kolla-ansible
Code Issues Proposed changes

Fix wsgi file path and log-file parameter

Browse Source 
* use gnocchi-api script for wsgi based on this commit[0].
* logfile is deprecated. Use log-file instead[1].

[0] c8717e8b71
[1] https://github.com/gnocchixyz/gnocchi/blob/master/gnocchi/opts.py#L77,L82

Change-Id: I8fbe8425e43d82e0f9601ba6303dd7f24142a2e6
This commit is contained in:
Jeffrey Zhang 2017-07-17 10:02:28 +08:00
parent 2cb46ffbae
commit 65ebba8b1d
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/gnocchi/templates/gnocchi-metricd.json.j2
View File

@ -1,5 +1,5 @@
{
"command": "gnocchi-metricd --logfile /var/log/kolla/gnocchi/gnocchi-metricd.log",
"command": "gnocchi-metricd --log-file /var/log/kolla/gnocchi/gnocchi-metricd.log",
"config_files": [
{
"source": "{{ container_config_directory }}/gnocchi.conf",

2
ansible/roles/gnocchi/templates/gnocchi-statsd.json.j2
View File

@ -1,5 +1,5 @@
{
"command": "gnocchi-statsd --logfile /var/log/kolla/gnocchi/gnocchi-statsd.log",
"command": "gnocchi-statsd --log-file /var/log/kolla/gnocchi/gnocchi-statsd.log",
"config_files": [
{
"source": "{{ container_config_directory }}/gnocchi.conf",

5
ansible/roles/gnocchi/templates/wsgi-gnocchi.conf.j2
View File

@ -1,4 +1,5 @@
{% set python_path = '/usr/lib/python2.7/site-packages' if kolla_install_type == 'binary' else '/var/lib/kolla/venv/lib/python2.7/site-packages' %}
{% set wsgi_path = '/usr/bin' if kolla_install_type == 'binary' else '/var/lib/kolla/venv/bin' %}
Listen {{ api_interface_address }}:{{ gnocchi_api_port }}
<VirtualHost *:{{ gnocchi_api_port }}>
@ -8,9 +9,9 @@ Listen {{ api_interface_address }}:{{ gnocchi_api_port }}
WSGIApplicationGroup %{GLOBAL}
WSGIDaemonProcess gnocchi group=gnocchi processes={{ openstack_service_workers }} threads=1 user=gnocchi python-path={{ python_path }}
WSGIProcessGroup gnocchi
WSGIScriptAlias / "{{ python_path }}/gnocchi/rest/app.wsgi"
WSGIScriptAlias / "{{ wsgi_path }}/gnocchi-api"
<Directory "{{ python_path }}/gnocchi/rest">
<Directory "{{ wsgi_path }}">
Require all granted
</Directory>