Skip to content
Snippets Groups Projects
Commit a9d5d319 authored by Zuul's avatar Zuul Committed by Gerrit Code Review
Browse files

Merge "External Ceph: Fix hardcoded gnocchi keyring"

parents 3269b13d d43fd186
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
ansible/roles/gnocchi/templates/gnocchi-metricd.json.j2
+ 2
− 2
View file @ a9d5d319
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
"perm": "0600" "perm": "0600"
}, },
{ {
"source": "{{ container_config_directory }}/ceph.client.gnocchi.keyring", "source": "{{ container_config_directory }}/{{ ceph_gnocchi_keyring }}",
"dest": "/etc/ceph/ceph.client.gnocchi.keyring", "dest": "/etc/ceph/{{ ceph_gnocchi_keyring }}",
"owner": "gnocchi", "owner": "gnocchi",
"perm": "0600" "perm": "0600"
}{% endif %} }{% endif %}
......
ansible/roles/gnocchi/templates/gnocchi-statsd.json.j2
+ 2
− 2
View file @ a9d5d319
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
"perm": "0600" "perm": "0600"
}, },
{ {
"source": "{{ container_config_directory }}/ceph.client.gnocchi.keyring", "source": "{{ container_config_directory }}/{{ ceph_gnocchi_keyring }}",
"dest": "/etc/ceph/ceph.client.gnocchi.keyring", "dest": "/etc/ceph/{{ ceph_gnocchi_keyring }}",
"owner": "gnocchi", "owner": "gnocchi",
"perm": "0600" "perm": "0600"
}{% endif %} }{% endif %}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment