From: Linggang Zeng <linggang.zeng@easystack.cn>
Date: Thu, 25 Oct 2018 06:49:03 +0000 (+0800)
Subject: Fix setenforce failed while selinux is disabled
X-Git-Tag: 1.1.0~293^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1228%2Fhead;p=teuthology.git

Fix setenforce failed while selinux is disabled

Signed-off-by: Linggang Zeng <linggang.zeng@easystack.cn>
---

diff --git a/teuthology/task/selinux.py b/teuthology/task/selinux.py
index fac277556..ee3a1aa56 100644
--- a/teuthology/task/selinux.py
+++ b/teuthology/task/selinux.py
@@ -94,6 +94,9 @@ class SELinux(Task):
         """
         log.info("Putting SELinux into %s mode", self.mode)
         for remote in self.cluster.remotes.iterkeys():
+            mode = self.old_modes[remote.name]
+            if mode == "Disabled" or mode == "disabled":
+                continue
             remote.run(
                 args=['sudo', '/usr/sbin/setenforce', self.mode],
             )
@@ -153,6 +156,8 @@ class SELinux(Task):
         log.info("Restoring old SELinux modes")
         for remote in self.cluster.remotes.iterkeys():
             mode = self.old_modes[remote.name]
+            if mode == "Disabled" or mode == "disabled":
+                continue
             if mode != self.mode:
                 remote.run(
                     args=['sudo', '/usr/sbin/setenforce', mode],