From: Adam King <adking@redhat.com>
Date: Mon, 1 Jul 2024 17:44:29 +0000 (-0400)
Subject: cephadm: turn off cgroups_split setting  when bootstrapping with --no-cgroups-split
X-Git-Tag: v17.2.8~214^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5d0b4524f16dc73f816e788a151a1ba797bf5014;p=ceph.git

cephadm: turn off cgroups_split setting  when bootstrapping with --no-cgroups-split

If users provide the --no-cgroups-split tag when bootstrapping a
cluster, they probably want the cluster to continue to not use
cgroups split for daemon post bootstrap. Setting the
mgr/cephadm/cgroups_split setting to false accomplishes that.

Fixes: https://tracker.ceph.com/issues/66848

Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit a60fa9f02416197e3bed3c9ef673f4712532e398)

Conflicts:
	src/cephadm/cephadm.py
---

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 2addee773e34..4e07b0ef1aa0 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -5919,6 +5919,10 @@ def command_bootstrap(ctx):
 
     cli(['config', 'set', 'mgr', 'mgr/cephadm/container_init', str(ctx.container_init), '--force'])
 
+    if ctx.no_cgroups_split:
+        logger.info('Setting mgr/cephadm/cgroups_split to false')
+        cli(['config', 'set', 'mgr', 'mgr/cephadm/cgroups_split', 'false', '--force'])
+
     if not ctx.skip_dashboard:
         prepare_dashboard(ctx, uid, gid, cli, wait_for_mgr_restart)