From 8150efe0195e61538714c0d76c2c8f86e7b8217e Mon Sep 17 00:00:00 2001 From: Linggang Zeng Date: Thu, 25 Oct 2018 14:49:03 +0800 Subject: [PATCH] Fix setenforce failed while selinux is disabled Signed-off-by: Linggang Zeng --- teuthology/task/selinux.py | 5 +++++ 1 file changed, 5 insertions(+) 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], -- 2.47.3