openstack/kolla-ansible
Code Issues Proposed changes

External Ceph: Fix hardcoded gnocchi keyring

Browse Source 
Change-Id: I507ebba82227e5f4567de6f5a0cb76f8ee46b2e3
Closes-Bug: #1862393
This commit is contained in:
Michal Nasiadka 2020-02-11 09:05:59 +01:00
parent a38c672ab4
commit d43fd1864b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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
View File

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