From: Teoman ONAY <tonay@ibm.com>
Date: Thu, 2 Mar 2023 22:01:48 +0000 (+0100)
Subject: Fixes selinux relabeling issue for nfs container
X-Git-Tag: v4.0.70.25~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2d0de9184ab258fe766bd66d9eead70fbd8b8aab;p=ceph-ansible.git

Fixes selinux relabeling issue for nfs container

Signed-off-by: Teoman ONAY <tonay@ibm.com>
---

diff --git a/roles/ceph-nfs/templates/ceph-nfs.service.j2 b/roles/ceph-nfs/templates/ceph-nfs.service.j2
index 3d4257e37..82c0c1c8a 100644
--- a/roles/ceph-nfs/templates/ceph-nfs.service.j2
+++ b/roles/ceph-nfs/templates/ceph-nfs.service.j2
@@ -23,7 +23,12 @@ ExecStart=/usr/bin/{{ container_binary }} run --rm --net=host \
   -d --log-driver journald --conmon-pidfile /%t/%n-pid --cidfile /%t/%n-cid \
 {% endif %}
   --pids-limit={{ 0 if container_binary == 'podman' else -1 }} \
+<<<<<<< HEAD
   -v /var/lib/ceph:/var/lib/ceph:z \
+=======
+  --security-opt label=disable \
+  -v /var/lib/ceph/bootstrap-rgw/:/var/lib/ceph/bootstrap-rgw:z \
+>>>>>>> c1b541f69 (Fixes selinux relabeling issue for nfs container)
   -v /etc/ceph:/etc/ceph:z \
   -v /var/lib/nfs/ganesha:/var/lib/nfs/ganesha:z \
   -v /etc/ganesha:/etc/ganesha:z \