From 6c102f30a06344c57b25a1786f175c78c1298796 Mon Sep 17 00:00:00 2001 From: John Mulligan Date: Fri, 24 Nov 2023 14:45:34 -0500 Subject: [PATCH] cephadm: call container daemon form prepare_data_dir Instead of always climbing through an "if ladder" based on daemon type variables we will have the option of using the common method provided by container daemon form classes. This will initially be used by the smb daemon. I don't have the energy to refactor all the existing stuff at the moment. Signed-off-by: John Mulligan (cherry picked from commit 0f6a18a09cba35515e100f457e224537ad1e5608) (cherry picked from commit bf7e40b4d1fee439a4a7f48cf033d4a0885890d0) --- src/cephadm/cephadm.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/cephadm/cephadm.py b/src/cephadm/cephadm.py index 606993c8018..890b447e93c 100755 --- a/src/cephadm/cephadm.py +++ b/src/cephadm/cephadm.py @@ -807,6 +807,11 @@ def create_daemon_dirs( node_proxy = NodeProxy.init(ctx, fsid, ident.daemon_id) node_proxy.create_daemon_dirs(data_dir, uid, gid) + else: + daemon = daemon_form_create(ctx, ident) + if isinstance(daemon, ContainerDaemonForm): + daemon.prepare_data_dir(data_dir, uid, gid) + _write_custom_conf_files(ctx, ident, uid, gid) -- 2.39.5