diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-09-28 06:18:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-09-28 06:18:52 +0000 |
| commit | 206edae28d855a933610727db4cdc54a43dc827d (patch) | |
| tree | 40f7443ef9f7e3c978c5cfb24fe30f06d2c934e0 /ansible | |
| parent | 205c0699c8a5b75ff5b860f064bb1a496538969a (diff) | |
| parent | 87f019481ebd54adf65e3d7e97330ee67ab28af9 (diff) | |
| download | kolla-206edae28d855a933610727db4cdc54a43dc827d.tar.gz kolla-206edae28d855a933610727db4cdc54a43dc827d.zip | |
Merge "Rename the gnocchi api-paste filename"
Diffstat (limited to 'ansible')
| -rw-r--r-- | ansible/roles/gnocchi/tasks/config.yml | 10 | ||||
| -rw-r--r-- | ansible/roles/gnocchi/templates/api-paste.ini.j2 (renamed from ansible/roles/gnocchi/templates/gnocchi-api-paste.ini.j2) | 0 | ||||
| -rw-r--r-- | ansible/roles/gnocchi/templates/gnocchi-api.json.j2 | 6 |
3 files changed, 11 insertions, 5 deletions
diff --git a/ansible/roles/gnocchi/tasks/config.yml b/ansible/roles/gnocchi/tasks/config.yml index 7baa626d3..2e7a75a8a 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 index 22b8c44b0..22b8c44b0 100644 --- a/ansible/roles/gnocchi/templates/gnocchi-api-paste.ini.j2 +++ b/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 318807a9f..2e5749f51 100644 --- a/ansible/roles/gnocchi/templates/gnocchi-api.json.j2 +++ b/ansible/roles/gnocchi/templates/gnocchi-api.json.j2 @@ -10,6 +10,12 @@ "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", "owner": "gnocchi", |