osd: add ipc=host in systemd template for containers

in addition to 15812970f033206b8680cc68351952d49cc18314

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit d5be83e5042a5e22ace6250234ccd81acaffb0a2)

diff --git a/roles/ceph-osd/templates/ceph-osd-run.sh.j2 b/roles/ceph-osd/templates/ceph-osd-run.sh.j2
index 4b39f92e45c5657b2d34bb986c92498146a42893..7e7cda05ea5f6a452dc18d01d2400cba8af86c09 100644 (file)
--- a/roles/ceph-osd/templates/ceph-osd-run.sh.j2
+++ b/roles/ceph-osd/templates/ceph-osd-run.sh.j2
@@ -75,6 +75,7 @@ fi
   --net=host \
   --privileged=true \
   --pid=host \
+  --ipc=host \
   --memory={{ ceph_osd_docker_memory_limit }} \
   {% if ceph_docker_version.split('.')[0] is version_compare('13', '>=') -%}
   --cpus={{ ceph_osd_docker_cpu_limit }} \

diff --git a/tox.ini b/tox.ini
index 081c4feebbafc51747e66621c9d35a20f0ef8375..d118fd1c4ad7c6d1461e202728c2842fd6809c9d 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -275,7 +275,6 @@ commands=
   ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/reboot.yml
 
   # wait 30sec for services to be ready
-  sleep 30
   # retest to ensure cluster came back up correctly after rebooting
   testinfra -n 8 --sudo -v --connection=ansible --ansible-inventory={changedir}/{env:INVENTORY} {toxinidir}/tests/functional/tests