openstack/kolla-ansible
Code Issues Proposed changes

Merge "External Ceph: Fix hardcoded gnocchi keyring"

Browse Source
This commit is contained in:
Zuul 2020-02-12 13:48:42 +00:00 committed by Gerrit Code Review
commit a9d5d31934
2 changed files with 4 additions and 4 deletions
ansible/roles/gnocchi/templates
gnocchi-metricd.json.j2gnocchi-statsd.json.j2

4
ansible/roles/gnocchi/templates/gnocchi-metricd.json.j2

@ -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 %}

4
ansible/roles/gnocchi/templates/gnocchi-statsd.json.j2

@ -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 %}