RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-26 21:43:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

cephadm: remember log destination used during bootstrap

Browse Source 
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 <jmulligan@redhat.com>
This commit is contained in:
John Mulligan 2023-09-06 14:15:41 -04:00
parent f550ca9850
commit 4d5502c7b4
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/cephadm/cephadm.py
View File

@ -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