From 58a527c192770a127abce1058974872cf360cea2 Mon Sep 17 00:00:00 2001 From: Noah Watkins Date: Wed, 27 Feb 2019 16:05:19 -0800 Subject: [PATCH] cv: expose host ipc namespace to ceph-volume container this is needed to properly handle semaphore synchronization for udev actions via dmcrypt/cryptsetup. Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1683770 Signed-off-by: Noah Watkins (cherry picked from commit 15812970f033206b8680cc68351952d49cc18314) # Conflicts: # library/ceph_volume.py --- library/ceph_volume.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/library/ceph_volume.py b/library/ceph_volume.py index b1de87e6b..045649ab0 100644 --- a/library/ceph_volume.py +++ b/library/ceph_volume.py @@ -182,8 +182,14 @@ def container_exec(binary, container_image): ''' Build the docker CLI to run a command inside a container ''' +<<<<<<< HEAD command_exec = ['docker', 'run', '--rm', '--privileged', '--net=host', +======= + container_binary = os.getenv('CEPH_CONTAINER_BINARY') + command_exec = [container_binary, 'run', + '--rm', '--privileged', '--net=host', '--ipc=host', +>>>>>>> 15812970... cv: expose host ipc namespace to ceph-volume container '-v', '/run/lock/lvm:/run/lock/lvm:z', '-v', '/var/run/udev/:/var/run/udev/:z', '-v', '/dev:/dev', '-v', '/etc/ceph:/etc/ceph:z',