summaryrefslogtreecommitdiffstats
path: root/src/cephadm/cephadm.py
diff options
context:
space:
mode:
authorGuillaume Abrioux <gabrioux@ibm.com>2024-08-08 21:12:38 +0200
committerGitHub <noreply@github.com>2024-08-08 21:12:38 +0200
commit1924efd8db7d17cac43ddcffb902dc72e3f0f510 (patch)
treeaab73ae7a65fbf4148b7f97871efbe6f940bfb41 /src/cephadm/cephadm.py
parentMerge PR #58861 into main (diff)
parentqa/cephadm: use cephadm ceph-volume directly to zap devs (diff)
downloadceph-1924efd8db7d17cac43ddcffb902dc72e3f0f510.tar.xz
ceph-1924efd8db7d17cac43ddcffb902dc72e3f0f510.zip
Merge pull request #57037 from adk3798/cephadm-limit-shell-mounts
cephadm: limit mounts for shell and ceph-volume commands
Diffstat (limited to 'src/cephadm/cephadm.py')
-rwxr-xr-xsrc/cephadm/cephadm.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cephadm/cephadm.py b/src/cephadm/cephadm.py
index fc99d9c17a5..7450d0945ed 100755
--- a/src/cephadm/cephadm.py
+++ b/src/cephadm/cephadm.py
@@ -3172,7 +3172,7 @@ def command_shell(ctx):
daemon_type = ctx.name
daemon_id = None
else:
- daemon_type = 'osd' # get the most mounts
+ daemon_type = 'shell' # get limited set of mounts
daemon_id = None
if ctx.fsid and daemon_type in ceph_daemons():
@@ -3310,7 +3310,7 @@ def command_ceph_volume(ctx):
lock.acquire()
(uid, gid) = (0, 0) # ceph-volume runs as root
- mounts = get_container_mounts_for_type(ctx, ctx.fsid, 'osd')
+ mounts = get_container_mounts_for_type(ctx, ctx.fsid, 'ceph-volume')
tmp_config = None
tmp_keyring = None