From: Adam King <adking@redhat.com>
Date: Tue, 20 Aug 2024 14:51:09 +0000 (-0400)
Subject: cephadm: mount nvmeof certs into container
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ffbedf30e55cb9eb82c483532f6645eb75e2f0aa;p=ceph-ci.git

cephadm: mount nvmeof certs into container

https://github.com/ceph/ceph/commit/2946b195edfc0b6a5cfcc661079e351601707ecb
incorrectly removed this line and since then these certs are
not being properly mounted into the container. This commit
adds the line back

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

diff --git a/src/cephadm/cephadmlib/daemons/nvmeof.py b/src/cephadm/cephadmlib/daemons/nvmeof.py
index 9b849497e0e..9bce32201bb 100644
--- a/src/cephadm/cephadmlib/daemons/nvmeof.py
+++ b/src/cephadm/cephadmlib/daemons/nvmeof.py
@@ -111,6 +111,7 @@ class CephNvmeof(ContainerDaemonForm):
             )
         else:
             mounts.update(self._get_container_mounts(data_dir, log_dir))
+        mounts.update(self._get_tls_cert_key_mounts(data_dir, self.files))
 
     def customize_container_binds(
         self, ctx: CephadmContext, binds: List[List[str]]