]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
cephadm/box: fix check cgroups v2
authorPere Diaz Bou <pdiazbou@redhat.com>
Mon, 8 Nov 2021 08:17:45 +0000 (09:17 +0100)
committerPere Diaz Bou <pdiazbou@redhat.com>
Wed, 15 Dec 2021 14:36:36 +0000 (15:36 +0100)
Signed-off-by: Pere Diaz Bou <pdiazbou@redhat.com>
src/cephadm/box/bootstrap.sh
src/cephadm/box/start

index 31a3778d1ff9490dbadaf53139d0000064ce7906..f2e39ed23a83c1f2c83c8d195471317c38021c67 100755 (executable)
@@ -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
 
index ba38f3c1ed95c42f3365019b2c7db579b9912e35..2a279535843b6a4674d7c141f148007a5643ec41 100755 (executable)
@@ -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