diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-09-28 06:17:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-09-28 06:17:32 +0000 |
| commit | 205c0699c8a5b75ff5b860f064bb1a496538969a (patch) | |
| tree | 460388cf98bc9766f6658571010dd9ce98acbaf1 | |
| parent | 622c88ec99c537fec3bd66d913b82ce3462e8a3a (diff) | |
| parent | c4fa05115c5a5723038b298bc85f89d6efd5b886 (diff) | |
| download | kolla-205c0699c8a5b75ff5b860f064bb1a496538969a.tar.gz kolla-205c0699c8a5b75ff5b860f064bb1a496538969a.zip | |
Merge "Use merge_configs for gnocchi-api-paste.ini file"
| -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: |