Use Remote.chcon() in task.internal.syslog()

Signed-off-by: Zack Cerza <zack@redhat.com>

diff --git a/teuthology/orchestra/remote.py b/teuthology/orchestra/remote.py
index 38004b0649acc02bfd4eaa394b6c99b43cf22bc1..f39cdf7ca203ae642064edd7e728df62bce68da3 100644 (file)
--- a/teuthology/orchestra/remote.py
+++ b/teuthology/orchestra/remote.py
@@ -11,7 +11,6 @@ import re
 import logging
 from cStringIO import StringIO
 from teuthology import lockstatus as ls
-from teuthology import misc
 import os
 import pwd
 import tempfile

diff --git a/teuthology/task/internal.py b/teuthology/task/internal.py
index 62f683a8285c08246dec6725e863874f6caa950d..a275f78707790dbce7e46b177323f306e9f7c7ac 100644 (file)
--- a/teuthology/task/internal.py
+++ b/teuthology/task/internal.py
@@ -598,14 +598,10 @@ def syslog(ctx, config):
     conf_fp = StringIO('\n'.join(conf_lines))
     try:
         for rem in ctx.cluster.remotes.iterkeys():
-            # Exclude downburst VMs for now; they have SELinux disabled
-            if rem.os.package_type == 'rpm' and not misc.is_vm(rem.shortname):
-                log_context = 'system_u:object_r:var_log_t:s0'
-                for log_path in (kern_log, misc_log):
-                    rem.run(
-                        args="touch {log} && sudo chcon {con} {log}".format(
-                            log=log_path, con=log_context),
-                    )
+            log_context = 'system_u:object_r:var_log_t:s0'
+            for log_path in (kern_log, misc_log):
+                rem.run(args='touch %s' % log_path)
+                rem.chcon(log_path, log_context)
             misc.sudo_write_file(
                 remote=rem,
                 path=CONF,