From 4d5502c7b41cfa8ed27801ca34424202d75bfd8d Mon Sep 17 00:00:00 2001 From: John Mulligan Date: Wed, 6 Sep 2023 14:15:41 -0400 Subject: [PATCH] cephadm: remember log destination used during bootstrap Store the log destination(s) specified on the CLI for cephadm bootstrap as the manager configuration, unless the configuration key is explicitly set by the input config. Signed-off-by: John Mulligan --- src/cephadm/cephadm.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/cephadm/cephadm.py b/src/cephadm/cephadm.py index 5d14ea773ec..50a1a4c27ae 100755 --- a/src/cephadm/cephadm.py +++ b/src/cephadm/cephadm.py @@ -5664,6 +5664,16 @@ def command_bootstrap(ctx): '-i', '/var/lib/ceph/user.conf'], {tmp.name: '/var/lib/ceph/user.conf:z'}) + if getattr(ctx, 'log_dest', None): + ldkey = 'mgr/cephadm/cephadm_log_destination' + cp = read_config(ctx.config) + if cp.has_option('mgr', ldkey): + logger.info('The cephadm log destination is set by the config file, ignoring cli option') + else: + value = ','.join(sorted(getattr(ctx, 'log_dest'))) + logger.info('Setting cephadm log destination to match logging for cephadm boostrap: %s', value) + cli(['config', 'set', 'mgr', ldkey, value, '--force']) + # wait for mgr to restart (after enabling a module) def wait_for_mgr_restart() -> None: # first get latest mgrmap epoch from the mon. try newer 'mgr -- 2.39.5