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

osd: add ipc=host in systemd template for containers 

in addition to 15812970f0

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
pull/3652/head
Guillaume Abrioux 2019-02-28 13:13:35 +01:00 committed by mergify[bot]
parent 1c30c76f8c
commit d5be83e504
2 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,6 +75,7 @@ fi
--net=host \ --net=host \
--privileged=true \ --privileged=true \
--pid=host \ --pid=host \
--ipc=host \
{% if osd_objectstore == 'filestore' -%} {% if osd_objectstore == 'filestore' -%}
--memory={{ ceph_osd_docker_memory_limit }} \ --memory={{ ceph_osd_docker_memory_limit }} \
{% endif -%} {% endif -%}

1
tox.ini
View File

@ -318,7 +318,6 @@ commands=
ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/reboot.yml ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/reboot.yml
# wait 30sec for services to be ready # wait 30sec for services to be ready
sleep 30
# retest to ensure cluster came back up correctly after rebooting # retest to ensure cluster came back up correctly after rebooting
testinfra -n 8 --durations=0 --sudo -v --connection=ansible --ansible-inventory={changedir}/{env:INVENTORY} {toxinidir}/tests/functional/tests testinfra -n 8 --durations=0 --sudo -v --connection=ansible --ansible-inventory={changedir}/{env:INVENTORY} {toxinidir}/tests/functional/tests