From de3465b6a3519a880096852f1e323316c904b479 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Thu, 28 Feb 2019 13:13:35 +0100 Subject: [PATCH] osd: add ipc=host in systemd template for containers in addition to 15812970f033206b8680cc68351952d49cc18314 Signed-off-by: Guillaume Abrioux (cherry picked from commit d5be83e5042a5e22ace6250234ccd81acaffb0a2) --- roles/ceph-osd/templates/ceph-osd-run.sh.j2 | 1 + tox.ini | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/ceph-osd/templates/ceph-osd-run.sh.j2 b/roles/ceph-osd/templates/ceph-osd-run.sh.j2 index 4b39f92e4..7e7cda05e 100644 --- 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 081c4feeb..d118fd1c4 100644 --- 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