From bf35bf769bbf36cfe8e3c08b062a043249ad2f2b Mon Sep 17 00:00:00 2001 From: John Mulligan Date: Thu, 19 Oct 2023 16:22:37 -0400 Subject: [PATCH] cephadm: use ceph specific get_daemon_args calls Use the new Ceph class specific get_daemon_args method instead of the generic get_daemon_args calls that check all sorts of daemon types when we're running specialized mon containers, which we know for certain are ceph based. Signed-off-by: John Mulligan --- src/cephadm/cephadm.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cephadm/cephadm.py b/src/cephadm/cephadm.py index 088234afb5f..f8b0243e37b 100755 --- a/src/cephadm/cephadm.py +++ b/src/cephadm/cephadm.py @@ -2924,7 +2924,7 @@ def deploy_daemon( '--fsid', ident.fsid, '-c', '/tmp/config', '--keyring', '/tmp/keyring', - ] + get_daemon_args(ctx, ident), + ] + Ceph.create(ctx, ident).get_daemon_args(), volume_mounts={ log_dir: '/var/log/ceph:z', mon_dir: '/var/lib/ceph/mon/ceph-%s:z' % (ident.daemon_id), @@ -4305,7 +4305,7 @@ def prepare_create_mon( '-c', '/dev/null', '--monmap', '/tmp/monmap', '--keyring', '/tmp/keyring', - ] + get_daemon_args(ctx, ident), + ] + Ceph.create(ctx, ident).get_daemon_args(), volume_mounts={ log_dir: '/var/log/ceph:z', mon_dir: '/var/lib/ceph/mon/ceph-%s:z' % (mon_id), -- 2.39.5