cephadm/box: cgroups volume if disabled 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 41ad55429b45f7df6478204f9dd6d30740ff3e11..31a3778d1ff9490dbadaf53139d0000064ce7906 100755 (executable)
--- a/src/cephadm/box/bootstrap.sh
+++ b/src/cephadm/box/bootstrap.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -x
 
 OSDS=1
 HOSTS=0
@@ -87,7 +88,12 @@ then
        # loops should be created before starting docker-compose or else docker could
        # not find lvs
        docker-compose down
-       docker-compose up --scale hosts=$HOSTS -d
+       DCFLAGS="-f docker-compose.yml"
+        if [[ -n /sys/fs/cgroup/cgroup.controllers ]]; then
+            DCFLAGS+=" -f docker-compose.cgroup1.yml"
+        fi
+
+       docker-compose $DCFLAGS up --scale hosts=$HOSTS -d
        sleep 3
 
        IPS=$(docker-ips | grep "box_hosts" | awk '{ print $1 }')

diff --git a/src/cephadm/box/docker-compose.cgroup1.yml b/src/cephadm/box/docker-compose.cgroup1.yml
new file mode 100644 (file)
index 0000000..ea23dec
--- /dev/null
+++ b/src/cephadm/box/docker-compose.cgroup1.yml
@@ -0,0 +1,10 @@
+version: "2.4"
+
+# If cgroups v2 is disabled then add cgroup fs
+services:
+        seed:
+            volumes:
+                - "/sys/fs/cgroup:/sys/fs/cgroup:ro"
+        hosts:
+            volumes:
+                - "/sys/fs/cgroup:/sys/fs/cgroup:ro"

diff --git a/src/cephadm/box/docker-compose.yml b/src/cephadm/box/docker-compose.yml
index 79271761f2d5f35deda3faa2ea5eba8ece0584c0..2151811919dc88d464afbdea222853f42c916759 100644 (file)
--- a/src/cephadm/box/docker-compose.yml
+++ b/src/cephadm/box/docker-compose.yml
@@ -15,7 +15,6 @@ services:
       - MKNOD
     stop_signal: RTMIN+3
     volumes:
-      - "/sys/fs/cgroup:/sys/fs/cgroup:ro"
       - ../../../:/ceph
       - ..:/cephadm
     networks: