diff --git a/ansible/roles/gnocchi/tasks/config.yml b/ansible/roles/gnocchi/tasks/config.yml index 7baa626d37..2e7a75a8a4 100644 --- a/ansible/roles/gnocchi/tasks/config.yml +++ b/ansible/roles/gnocchi/tasks/config.yml @@ -18,13 +18,13 @@ - "gnocchi-metricd" - "gnocchi-statsd" -- name: Copying over gnocchi-api-paste.ini +- name: Copying over api-paste.ini merge_configs: sources: - - "{{ role_path }}/templates/gnocchi-api-paste.ini.j2" - - "{{ node_custom_config }}/gnocchi/gnocchi-api-paste.ini" - - "{{ node_custom_config }}/gnocchi/{{ inventory_hostname }}/gnocchi-api-paste.ini" - dest: "{{ node_config_directory }}/gnocchi-api/gnocchi-api-paste.ini" + - "{{ role_path }}/templates/api-paste.ini.j2" + - "{{ node_custom_config }}/gnocchi/api-paste.ini" + - "{{ node_custom_config }}/gnocchi/{{ inventory_hostname }}/api-paste.ini" + dest: "{{ node_config_directory }}/gnocchi-api/api-paste.ini" - name: Copying over gnocchi.conf merge_configs: diff --git a/ansible/roles/gnocchi/templates/gnocchi-api-paste.ini.j2 b/ansible/roles/gnocchi/templates/api-paste.ini.j2 similarity index 100% rename from ansible/roles/gnocchi/templates/gnocchi-api-paste.ini.j2 rename to ansible/roles/gnocchi/templates/api-paste.ini.j2 diff --git a/ansible/roles/gnocchi/templates/gnocchi-api.json.j2 b/ansible/roles/gnocchi/templates/gnocchi-api.json.j2 index 318807a9f7..2e5749f51c 100644 --- a/ansible/roles/gnocchi/templates/gnocchi-api.json.j2 +++ b/ansible/roles/gnocchi/templates/gnocchi-api.json.j2 @@ -9,6 +9,12 @@ "owner": "gnocchi", "perm": "0600" }, + { + "source": "{{ container_config_directory }}/api-paste.ini", + "dest": "/etc/gnocchi/api-paste.ini", + "owner": "gnocchi", + "perm": "0600" + }, { "source": "{{ container_config_directory }}/wsgi-gnocchi.conf", "dest": "/etc/{{ gnocchi_dir }}/wsgi-gnocchi.conf",