From 42d11d46b5f0b6707befd0e3fbf51926290df004 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 24 Feb 2021 11:59:44 -0500 Subject: [PATCH] cephadm: provide meta during bootstrap This is slightly gross, but we need ctx.meta_json for the bootstrap case, which deploys a mon and mgr. Signed-off-by: Sage Weil --- src/cephadm/cephadm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm index 477ebfe6161..a00081a8769 100755 --- a/src/cephadm/cephadm +++ b/src/cephadm/cephadm @@ -3458,6 +3458,7 @@ def create_mon( fsid: str, mon_id: str ) -> None: mon_c = get_container(ctx, fsid, 'mon', mon_id) + ctx.meta_json = json.dumps({"service_name": "mon"}) deploy_daemon(ctx, fsid, 'mon', mon_id, mon_c, uid, gid, config=None, keyring=None) @@ -3503,6 +3504,7 @@ def create_mgr( mgr_keyring = '[mgr.%s]\n\tkey = %s\n' % (mgr_id, mgr_key) mgr_c = get_container(ctx, fsid, 'mgr', mgr_id) # Note:the default port used by the Prometheus node exporter is opened in fw + ctx.meta_json = json.dumps({"service_name": "mgr"}) deploy_daemon(ctx, fsid, 'mgr', mgr_id, mgr_c, uid, gid, config=config, keyring=mgr_keyring, ports=[9283]) -- 2.39.5