Docker: Fix bug "waiting for /dev/XXX to show up"

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>

diff --git a/roles/ceph-osd/templates/ceph-osd-run.sh.j2 b/roles/ceph-osd/templates/ceph-osd-run.sh.j2
index 193bbefde63165bd5d322c74064b28796fc1b42e..bd07772ad18a2198aea1382f57fed90d5b53fed0 100644 (file)
--- a/roles/ceph-osd/templates/ceph-osd-run.sh.j2
+++ b/roles/ceph-osd/templates/ceph-osd-run.sh.j2
@@ -27,12 +27,7 @@ create_dev_list $1
 /usr/bin/docker run \
   --rm \
   --net=host \
-  {% if 'OSD_DMCRYPT=1' in ceph_osd_docker_extra_env -%}
   --privileged=true \
-  -v /dev:/dev \
-  {% else -%}
-  --cap-add SYS_ADMIN \
-  {% endif -%}
   {% if ansible_distribution == 'Ubuntu' -%}
   --security-opt apparmor:unconfined \
   {% endif -%}
@@ -45,6 +40,7 @@ create_dev_list $1
   -e KV_IP={{kv_endpoint}} \
   -e KV_PORT={{kv_port}} \
   {% endif -%}
+  -v /dev:/dev \
   -v /etc/localtime:/etc/localtime:ro \
   --device=/dev/${1} \
   --device=/dev/${1}1 \