From: Pere Diaz Bou <pdiazbou@redhat.com>
Date: Mon, 8 Nov 2021 08:17:45 +0000 (+0100)
Subject: cephadm/box: fix check cgroups v2
X-Git-Tag: v17.1.0~148^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4fba3cde0edfbb0530d94643a1fb1048f134e5fb;p=ceph.git

cephadm/box: fix check cgroups v2

Signed-off-by: Pere Diaz Bou <pdiazbou@redhat.com>
---

diff --git a/src/cephadm/box/bootstrap.sh b/src/cephadm/box/bootstrap.sh
index 31a3778d1ff9..f2e39ed23a83 100755
--- a/src/cephadm/box/bootstrap.sh
+++ b/src/cephadm/box/bootstrap.sh
@@ -89,7 +89,7 @@ then
 	# not find lvs
 	docker-compose down
 	DCFLAGS="-f docker-compose.yml"
-        if [[ -n /sys/fs/cgroup/cgroup.controllers ]]; then
+        if [[ ! -f /sys/fs/cgroup/cgroup.controllers ]]; then
             DCFLAGS+=" -f docker-compose.cgroup1.yml"
         fi
 
diff --git a/src/cephadm/box/start b/src/cephadm/box/start
index ba38f3c1ed95..2a279535843b 100755
--- a/src/cephadm/box/start
+++ b/src/cephadm/box/start
@@ -5,7 +5,6 @@ set -euxo pipefail
 ln -s -f /cephadm/cephadm $CEPHADM_PATH
 chmod +x $CEPHADM_PATH
 
-tail -f /var/log/ceph/cephadm.log 1>&2 &
 
 EXTRA_ARGS=()
 if [[ -n "${SHARED_CEPH_FOLDER-}" ]]; then