From d43fd1864b6a8ee73228531d7d90bfec050cb647 Mon Sep 17 00:00:00 2001
From: Michal Nasiadka <mnasiadka@gmail.com>
Date: Tue, 11 Feb 2020 09:05:59 +0100
Subject: [PATCH] External Ceph: Fix hardcoded gnocchi keyring

Change-Id: I507ebba82227e5f4567de6f5a0cb76f8ee46b2e3
Closes-Bug: #1862393
---
 ansible/roles/gnocchi/templates/gnocchi-metricd.json.j2 | 4 ++--
 ansible/roles/gnocchi/templates/gnocchi-statsd.json.j2  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ansible/roles/gnocchi/templates/gnocchi-metricd.json.j2 b/ansible/roles/gnocchi/templates/gnocchi-metricd.json.j2
index fbbcd89a4a..aa43975270 100644
--- a/ansible/roles/gnocchi/templates/gnocchi-metricd.json.j2
+++ b/ansible/roles/gnocchi/templates/gnocchi-metricd.json.j2
@@ -20,8 +20,8 @@
             "perm": "0600"
         },
         {
-            "source": "{{ container_config_directory }}/ceph.client.gnocchi.keyring",
-            "dest": "/etc/ceph/ceph.client.gnocchi.keyring",
+            "source": "{{ container_config_directory }}/{{ ceph_gnocchi_keyring }}",
+            "dest": "/etc/ceph/{{ ceph_gnocchi_keyring }}",
             "owner": "gnocchi",
             "perm": "0600"
         }{% endif %}
diff --git a/ansible/roles/gnocchi/templates/gnocchi-statsd.json.j2 b/ansible/roles/gnocchi/templates/gnocchi-statsd.json.j2
index 9a9203dcfb..027e146860 100644
--- a/ansible/roles/gnocchi/templates/gnocchi-statsd.json.j2
+++ b/ansible/roles/gnocchi/templates/gnocchi-statsd.json.j2
@@ -20,8 +20,8 @@
             "perm": "0600"
         },
         {
-            "source": "{{ container_config_directory }}/ceph.client.gnocchi.keyring",
-            "dest": "/etc/ceph/ceph.client.gnocchi.keyring",
+            "source": "{{ container_config_directory }}/{{ ceph_gnocchi_keyring }}",
+            "dest": "/etc/ceph/{{ ceph_gnocchi_keyring }}",
             "owner": "gnocchi",
             "perm": "0600"
         }{% endif %}