]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
cephadm: fix selinux mount mis-indent 39636/head
authorSage Weil <sage@newdream.net>
Mon, 15 Feb 2021 22:35:53 +0000 (16:35 -0600)
committerJuan Miguel Olmo Martínez <jolmomar@redhat.com>
Tue, 23 Feb 2021 09:34:26 +0000 (10:34 +0100)
We want to map this path even if we had to create the empty directory.

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 28582d544312657252c04c1f004409e44cff8c56)

src/cephadm/cephadm

index 34f07fbd3d1f6d02aa4df46f8fdec11665d615cd..72d46adf84b2ee82a971a65e9a66790fc951dcae 100755 (executable)
@@ -2288,7 +2288,7 @@ def get_container_mounts(ctx, fsid, daemon_type, daemon_id,
             selinux_folder = '/var/lib/ceph/%s/selinux' % fsid
             if not os.path.exists(selinux_folder):
                 os.makedirs(selinux_folder, mode=0o755)
-                mounts[selinux_folder] = '/sys/fs/selinux:ro'
+            mounts[selinux_folder] = '/sys/fs/selinux:ro'
         mounts['/run/lvm'] = '/run/lvm'
         mounts['/run/lock/lvm'] = '/run/lock/lvm'