]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
cephadm: remove z option from iSCSI dev and configfs mount
authorAdam King <adking@redhat.com>
Fri, 4 Sep 2020 12:06:37 +0000 (08:06 -0400)
committerNathan Cutler <ncutler@suse.com>
Tue, 6 Oct 2020 09:40:53 +0000 (11:40 +0200)
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>
(cherry picked from commit 351b92acdacd2bea0c7c0e7c08b0b82f277621f8)

src/cephadm/cephadm

index 12c9ff99cbfbb830ce7f744c4687df0e841e2d28..6d32fc9fee8b7367d64acfe8e89f77b7c0cccca0 100755 (executable)
@@ -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