From: Adam King <adking@redhat.com>
Date: Fri, 4 Sep 2020 12:06:37 +0000 (-0400)
Subject: cephadm: remove z option from iSCSI dev and configfs mount
X-Git-Tag: v16.1.0~1124^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F37094%2Fhead;p=ceph.git

cephadm: remove z option from iSCSI dev and configfs mount

selinux complains if you try to deploy iSCSI with the z option
on the /dev and /sys/kernel/config mounts

Signed-off-by: Adam King <adking@redhat.com>
---

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 83ccbd336817..acd807a572e4 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -414,9 +414,9 @@ class CephIscsi(object):
         mounts[os.path.join(data_dir, 'config')] = '/etc/ceph/ceph.conf:z'
         mounts[os.path.join(data_dir, 'keyring')] = '/etc/ceph/keyring:z'
         mounts[os.path.join(data_dir, 'iscsi-gateway.cfg')] = '/etc/ceph/iscsi-gateway.cfg:z'
-        mounts[os.path.join(data_dir, 'configfs')] = '/sys/kernel/config:z'
+        mounts[os.path.join(data_dir, 'configfs')] = '/sys/kernel/config'
         mounts[log_dir] = '/var/log/rbd-target-api:z'
-        mounts['/dev'] = '/dev:z'
+        mounts['/dev'] = '/dev'
         return mounts
 
     @staticmethod