From: Adam King <adking@redhat.com>
Date: Thu, 27 Jul 2023 19:47:51 +0000 (-0400)
Subject: cephadm: mount keyring deployed for nvmeof daemon
X-Git-Tag: v18.2.1~326^2~30
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=afe55a397ac6266104f896eff957fd8c68730ad8;p=ceph.git

cephadm: mount keyring deployed for nvmeof daemon

Before, we were just using the client.admin keyring
as a temporary workaround while we figured out
how to get the keyring to work. We should swap
over to using the keyring we actually generated
for the nvmeof daemon.

Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit bad1259e3830adadac6f04591976899da5cbbb80)
---

diff --git a/src/cephadm/cephadm.py b/src/cephadm/cephadm.py
index c08d926252c9..e35b8a44bd14 100755
--- a/src/cephadm/cephadm.py
+++ b/src/cephadm/cephadm.py
@@ -1020,8 +1020,7 @@ class CephNvmeof(object):
     def get_container_mounts(data_dir: str) -> Dict[str, str]:
         mounts = dict()
         mounts[os.path.join(data_dir, 'config')] = '/etc/ceph/ceph.conf:z'
-        # mounts[os.path.join(data_dir, 'keyring')] = '/etc/ceph/keyring:z'
-        mounts['/etc/ceph/ceph.client.admin.keyring'] = '/etc/ceph/keyring:z'  # TODO: FIXME
+        mounts[os.path.join(data_dir, 'keyring')] = '/etc/ceph/keyring:z'
         mounts[os.path.join(data_dir, 'ceph-nvmeof.conf')] = '/src/ceph-nvmeof.conf:z'
         mounts[os.path.join(data_dir, 'configfs')] = '/sys/kernel/config'
         mounts['/dev/hugepages'] = '/dev/hugepages'