]> git-server-git.apps.pok.os.sepia.ceph.com Git - teuthology.git/commitdiff
Fix setenforce failed while selinux is disabled 1228/head
authorLinggang Zeng <linggang.zeng@easystack.cn>
Thu, 25 Oct 2018 06:49:03 +0000 (14:49 +0800)
committerLinggang Zeng <linggang.zeng@easystack.cn>
Thu, 25 Oct 2018 06:49:03 +0000 (14:49 +0800)
Signed-off-by: Linggang Zeng <linggang.zeng@easystack.cn>
teuthology/task/selinux.py

index fac277556bcaf2949925d6ecaa33ca4aee23625f..ee3a1aa566f5f0783ad3afb7e0469592ebf1293c 100644 (file)
@@ -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],