From 624e0d3356134e5a0e072150e8f4bdebec469b13 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 8 Mar 2021 14:18:04 -0500 Subject: [PATCH] cephadm: populate ports if known and not included in unit.meta This is only helpful for daemons deployed by older versions of cephadm that have known ports based on their type. Signed-off-by: Sage Weil --- src/cephadm/cephadm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm index 7d2d25505989e..75be85f3c6dd2 100755 --- a/src/cephadm/cephadm +++ b/src/cephadm/cephadm @@ -2549,7 +2549,7 @@ def deploy_daemon(ctx, fsid, daemon_type, daemon_id, c, uid, gid, else: if c: deploy_daemon_units(ctx, fsid, uid, gid, daemon_type, daemon_id, - c, osd_fsid=osd_fsid) + c, osd_fsid=osd_fsid, ports=ports) else: raise RuntimeError('attempting to deploy a daemon without a container image') @@ -2613,6 +2613,7 @@ def deploy_daemon_units( enable: bool = True, start: bool = True, osd_fsid: Optional[str] = None, + ports: Optional[List[int]] = None, ) -> None: # cmd data_dir = get_data_dir(fsid, ctx.data_dir, daemon_type, daemon_id) @@ -2674,6 +2675,8 @@ def deploy_daemon_units( 'memory_request': int(ctx.memory_request) if ctx.memory_request else None, 'memory_limit': int(ctx.memory_limit) if ctx.memory_limit else None, }) + if not meta.get('ports'): + meta['ports'] = ports metaf.write(json.dumps(meta, indent=4) + '\n') os.fchmod(f.fileno(), 0o600) -- 2.39.5