openstack/kolla-ansible
Code Issues Proposed changes

Merge "Rename the gnocchi api-paste filename"

Browse Source
This commit is contained in:
Jenkins 2016-09-28 06:18:52 +00:00 committed by Gerrit Code Review
commit 206edae28d
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ansible/roles/gnocchi/tasks/config.yml
View File

@ -18,13 +18,13 @@
- "gnocchi-metricd" - "gnocchi-metricd"
- "gnocchi-statsd" - "gnocchi-statsd"
- name: Copying over gnocchi-api-paste.ini - name: Copying over api-paste.ini
merge_configs: merge_configs:
sources: sources:
- "{{ role_path }}/templates/gnocchi-api-paste.ini.j2" - "{{ role_path }}/templates/api-paste.ini.j2"
- "{{ node_custom_config }}/gnocchi/gnocchi-api-paste.ini" - "{{ node_custom_config }}/gnocchi/api-paste.ini"
- "{{ node_custom_config }}/gnocchi/{{ inventory_hostname }}/gnocchi-api-paste.ini" - "{{ node_custom_config }}/gnocchi/{{ inventory_hostname }}/api-paste.ini"
dest: "{{ node_config_directory }}/gnocchi-api/gnocchi-api-paste.ini" dest: "{{ node_config_directory }}/gnocchi-api/api-paste.ini"
- name: Copying over gnocchi.conf - name: Copying over gnocchi.conf
merge_configs: merge_configs:

0
ansible/roles/gnocchi/templates/gnocchi-api-paste.ini.j2 → ansible/roles/gnocchi/templates/api-paste.ini.j2
View File

6
ansible/roles/gnocchi/templates/gnocchi-api.json.j2
View File

@ -9,6 +9,12 @@
"owner": "gnocchi", "owner": "gnocchi",
"perm": "0600" "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", "source": "{{ container_config_directory }}/wsgi-gnocchi.conf",
"dest": "/etc/{{ gnocchi_dir }}/wsgi-gnocchi.conf", "dest": "/etc/{{ gnocchi_dir }}/wsgi-gnocchi.conf",