From 4fba3cde0edfbb0530d94643a1fb1048f134e5fb Mon Sep 17 00:00:00 2001 From: Pere Diaz Bou Date: Mon, 8 Nov 2021 09:17:45 +0100 Subject: [PATCH] cephadm/box: fix check cgroups v2 Signed-off-by: Pere Diaz Bou --- src/cephadm/box/bootstrap.sh | 2 +- src/cephadm/box/start | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/cephadm/box/bootstrap.sh b/src/cephadm/box/bootstrap.sh index 31a3778d1ff94..f2e39ed23a83c 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 ba38f3c1ed95c..2a279535843b6 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 -- 2.39.5