From: Gilad Sid <sid.gilad@gmail.com>
Date: Wed, 1 May 2024 14:55:41 +0000 (+0300)
Subject: cephadm: Adding support to pass --no-cgroups-split flag when adopting legacy daemons
X-Git-Tag: v17.2.8~229^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6a03d84bcb7db6a969be65e4471c6ce37d76b3f0;p=ceph.git

cephadm: Adding support to pass --no-cgroups-split flag when adopting legacy daemons

Signed-off-by: Gilad Sid <sid.gilad@gmail.com>
(cherry picked from commit 20ffd4d6e330095c8cf2816a36f61bd950e213a5)

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

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 2addee773e34..5e57f7e52078 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -9214,6 +9214,11 @@ def _get_parser():
         action='store_true',
         default=CONTAINER_INIT,
         help=argparse.SUPPRESS)
+    parser_adopt.add_argument(
+        '--no-cgroups-split',
+        action='store_true',
+        default=False,
+        help='Do not run containers with --cgroups=split (currently only relevant when using podman)')
 
     parser_rm_daemon = subparsers.add_parser(
         'rm-daemon', help='remove daemon instance')