From: Sage Weil <sage@newdream.net>
Date: Mon, 15 Feb 2021 22:35:53 +0000 (-0600)
Subject: cephadm: fix selinux mount mis-indent
X-Git-Tag: v16.2.0~179^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F39636%2Fhead;p=ceph.git

cephadm: fix selinux mount mis-indent

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)
---

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 34f07fbd3d1f..72d46adf84b2 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -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'