summaryrefslogtreecommitdiffstats
path: root/src/cephadm
diff options
context:
space:
mode:
authorAdam King <adking@redhat.com>2024-07-01 19:44:29 +0200
committerAdam King <adking@redhat.com>2024-07-10 19:03:44 +0200
commita60fa9f02416197e3bed3c9ef673f4712532e398 (patch)
treed3b71e167955895bec5c452bef37a8f296dd56e0 /src/cephadm
parentMerge pull request #57238 from rhcs-dashboard/lifecycle-policies (diff)
downloadceph-a60fa9f02416197e3bed3c9ef673f4712532e398.tar.xz
ceph-a60fa9f02416197e3bed3c9ef673f4712532e398.zip
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>
Diffstat (limited to 'src/cephadm')
-rwxr-xr-xsrc/cephadm/cephadm.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/cephadm/cephadm.py b/src/cephadm/cephadm.py
index df7a657e24c..bcb2a4a1205 100755
--- a/src/cephadm/cephadm.py
+++ b/src/cephadm/cephadm.py
@@ -2878,6 +2878,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)