diff --git a/ansible/roles/gnocchi/templates/gnocchi-metricd.json.j2 b/ansible/roles/gnocchi/templates/gnocchi-metricd.json.j2 index 25e63ac232316e3448c95649cc764fd9e4a2baa4..2285095816aea406d337ffcd1705045978841fd7 100644 --- a/ansible/roles/gnocchi/templates/gnocchi-metricd.json.j2 +++ b/ansible/roles/gnocchi/templates/gnocchi-metricd.json.j2 @@ -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", diff --git a/ansible/roles/gnocchi/templates/gnocchi-statsd.json.j2 b/ansible/roles/gnocchi/templates/gnocchi-statsd.json.j2 index 0fad3b6e144bfece47604d6b97826025ee1d8c76..8613c343dbbf249f7480594f7e2193a564982c84 100644 --- a/ansible/roles/gnocchi/templates/gnocchi-statsd.json.j2 +++ b/ansible/roles/gnocchi/templates/gnocchi-statsd.json.j2 @@ -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", diff --git a/ansible/roles/gnocchi/templates/wsgi-gnocchi.conf.j2 b/ansible/roles/gnocchi/templates/wsgi-gnocchi.conf.j2 index 59ae05c7f32999c22681490ac6750be3b1812354..3ba0c2ddfdcd0f355d70b2e2c00ef3ea47a69d04 100644 --- a/ansible/roles/gnocchi/templates/wsgi-gnocchi.conf.j2 +++ b/ansible/roles/gnocchi/templates/wsgi-gnocchi.conf.j2 @@ -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>