diff options
| author | Christian Berendt <berendt@betacloud-solutions.de> | 2016-09-23 09:42:01 +0200 |
|---|---|---|
| committer | Christian Berendt <berendt@betacloud-solutions.de> | 2016-09-27 15:01:49 +0000 |
| commit | c4fa05115c5a5723038b298bc85f89d6efd5b886 (patch) | |
| tree | c487cc104678c48d7bb5fb6bf2376b71454e3cea | |
| parent | 3214906276684a4ca3b912a27af73f963569f4c6 (diff) | |
| download | kolla-c4fa05115c5a5723038b298bc85f89d6efd5b886.tar.gz kolla-c4fa05115c5a5723038b298bc85f89d6efd5b886.zip | |
Use merge_configs for gnocchi-api-paste.ini file
TrivialFix
Change-Id: I0ab0ea635e630390d43f12a5521f12e102b2351b
| -rw-r--r-- | ansible/roles/gnocchi/tasks/config.yml | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/ansible/roles/gnocchi/tasks/config.yml b/ansible/roles/gnocchi/tasks/config.yml index 53740110f..7baa626d3 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: |