osd: add ipc=host in systemd template for containers

in addition to 15812970f033206b8680cc68351952d49cc18314

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 20496634ff9aaff5d3fa097ccd9484fe8ec505ff..1c5dee4a3c298fbb5e62ec4d1b99b9407c9aea77 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 \
   {% if osd_objectstore == 'filestore' -%}
   --memory={{ ceph_osd_docker_memory_limit }} \
   {% endif -%}

diff --git a/tox.ini b/tox.ini
index e41eb77b1bab6754ec03d24c4ac1ac4f1cdb54c8..6498fc82cae53eca8e6f6674cc6f6a6989f07cc6 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -318,7 +318,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 --durations=0 --sudo -v --connection=ansible --ansible-inventory={changedir}/{env:INVENTORY} {toxinidir}/tests/functional/tests