Merge pull request ceph#59363 from adk3798/cephadm-mount-nvmeof-certs

adk3798 · web-flow · commit 257a51e2e293 · 2024-08-29T07:11:24.000-04:00
cephadm: mount nvmeof certs into container

Reviewed-by: Alexander Indenbaum &lt;aindenba@redhat.com&gt;
Reviewed-by: John Mulligan &lt;jmulligan@redhat.com&gt;
diff --git a/src/cephadm/cephadmlib/daemons/nvmeof.py b/src/cephadm/cephadmlib/daemons/nvmeof.py
@@ -111,6 +111,7 @@ def customize_container_mounts(
             )
         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]]

Original file line number	Diff line number	Diff line change
`@@ -111,6 +111,7 @@ def customize_container_mounts(`
`111`	`111`	`)`
`112`	`112`	`else:`
`113`	`113`	`mounts.update(self._get_container_mounts(data_dir, log_dir))`
	`114`	`+ mounts.update(self._get_tls_cert_key_mounts(data_dir, self.files))`
`114`	`115`
`115`	`116`	`def customize_container_binds(`
`116`	`117`	`self, ctx: CephadmContext, binds: List[List[str]]`