From: Guillaume Abrioux <gabrioux@redhat.com>
Date: Sun, 9 Jul 2017 09:40:40 +0000 (+0200)
Subject: Docker: Fix bug "waiting for /dev/XXX to show up"
X-Git-Tag: v2.3.0rc2~3^2~2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=30a0fa31e3dde1e68e084e981f07c330e2c96fef;p=ceph-ansible.git

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 193bbefde..bd07772ad 100644
--- 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 \