openstack/kolla-ansible
Code Issues Proposed changes

Merge "Fix Grafana config for extra conf"

Browse Source
This commit is contained in:
Zuul 2018-05-17 01:11:42 +00:00 committed by Gerrit Code Review
commit ae9dbdfbdd
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/grafana/tasks/config.yml
View File

@ -53,8 +53,6 @@
- name: Copying over extra configuration file - name: Copying over extra configuration file
become: true become: true
vars:
service_name: "{{ item.0 }}"
template: template:
src: "{{ item.path }}" src: "{{ item.path }}"
dest: "{{ node_config_directory }}/grafana/{{ item.path | basename }}" dest: "{{ node_config_directory }}/grafana/{{ item.path | basename }}"

2
ansible/roles/grafana/templates/grafana.json.j2
View File

@ -12,7 +12,7 @@
"source": "{{ container_config_directory }}/{{ plugin.path | basename }}", "source": "{{ container_config_directory }}/{{ plugin.path | basename }}",
"dest": "/etc/grafana/{{ plugin.path | basename }}", "dest": "/etc/grafana/{{ plugin.path | basename }}",
"owner": "grafana", "owner": "grafana",
"perm": "0600", "perm": "0600"
}, },
{% endfor %}{% endif %}{% endif %} {% endfor %}{% endif %}{% endif %}
{ {