ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
pull/1656/head
Guillaume Abrioux 2017-07-09 11:40:40 +02:00
parent f16841e09e
commit 30a0fa31e3
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
roles/ceph-osd/templates/ceph-osd-run.sh.j2
View File

@ -27,12 +27,7 @@ create_dev_list $1
/usr/bin/docker run \ /usr/bin/docker run \
--rm \ --rm \
--net=host \ --net=host \
{% if 'OSD_DMCRYPT=1' in ceph_osd_docker_extra_env -%}
--privileged=true \ --privileged=true \
-v /dev:/dev \
{% else -%}
--cap-add SYS_ADMIN \
{% endif -%}
{% if ansible_distribution == 'Ubuntu' -%} {% if ansible_distribution == 'Ubuntu' -%}
--security-opt apparmor:unconfined \ --security-opt apparmor:unconfined \
{% endif -%} {% endif -%}
@ -45,6 +40,7 @@ create_dev_list $1
-e KV_IP={{kv_endpoint}} \ -e KV_IP={{kv_endpoint}} \
-e KV_PORT={{kv_port}} \ -e KV_PORT={{kv_port}} \
{% endif -%} {% endif -%}
-v /dev:/dev \
-v /etc/localtime:/etc/localtime:ro \ -v /etc/localtime:/etc/localtime:ro \
--device=/dev/${1} \ --device=/dev/${1} \
--device=/dev/${1}1 \ --device=/dev/${1}1 \