From: Noah Watkins <noahwatkins@gmail.com>
Date: Thu, 28 Feb 2019 00:05:19 +0000 (-0800)
Subject: cv: expose host ipc namespace to ceph-volume container
X-Git-Tag: v3.2.8~2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=58a527c192770a127abce1058974872cf360cea2;p=ceph-ansible.git

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 <noahwatkins@gmail.com>
(cherry picked from commit 15812970f033206b8680cc68351952d49cc18314)

# Conflicts:
#	library/ceph_volume.py
---

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',