From c4fa05115c5a5723038b298bc85f89d6efd5b886 Mon Sep 17 00:00:00 2001 From: Christian Berendt Date: Fri, 23 Sep 2016 09:42:01 +0200 Subject: [PATCH] Use merge_configs for gnocchi-api-paste.ini file TrivialFix Change-Id: I0ab0ea635e630390d43f12a5521f12e102b2351b --- ansible/roles/gnocchi/tasks/config.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/ansible/roles/gnocchi/tasks/config.yml b/ansible/roles/gnocchi/tasks/config.yml index 53740110f7..7baa626d37 100644 --- a/ansible/roles/gnocchi/tasks/config.yml +++ b/ansible/roles/gnocchi/tasks/config.yml @@ -18,12 +18,13 @@ - "gnocchi-metricd" - "gnocchi-statsd" -- name: Copying over api-paste.ini files for services - template: - src: "gnocchi-api-paste.ini.j2" - dest: "{{ node_config_directory }}/{{ item }}/gnocchi-api-paste.ini" - with_items: - - "gnocchi-api" +- name: Copying over gnocchi-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" - name: Copying over gnocchi.conf merge_configs: