Use service instead of initctl to restart rsyslog.

This change is needed to make sure teuthology works on CentOS when the
-a option is specified.

Signed-off-by: Warren Usui <warren.usui@inktank.com>

diff --git a/teuthology/nuke.py b/teuthology/nuke.py
index 21dd047b1c237bc8afaa6bc2e467153cc4493c9d..d3fd8e0dd10be872ca289da88ccc8bd2f56b19ff 100644 (file)
--- a/teuthology/nuke.py
+++ b/teuthology/nuke.py
@@ -212,7 +212,7 @@ def reset_syslog_dir(ctx, log):
                 'then',
                 'sudo', 'rm', '-f', '--', '/etc/rsyslog.d/80-cephtest.conf',
                 run.Raw('&&'),
-                'sudo', 'initctl', 'restart', 'rsyslog',
+                'sudo', 'service', 'rsyslog', 'restart',
                 run.Raw(';'),
                 'fi',
                 run.Raw(';'),

diff --git a/teuthology/task/internal.py b/teuthology/task/internal.py
index e10bfdc4fc6aa97865f710707d0f259803c3293d..fe3ef354945a88760c61403f08d0ef76273af8cb 100644 (file)
--- a/teuthology/task/internal.py
+++ b/teuthology/task/internal.py
@@ -342,11 +342,11 @@ kern.* -{adir}/syslog/kern.log;RSYSLOG_FileFormat
             ctx.cluster.run(
                 args=[
                     'sudo',
-                    'initctl',
+                    'service',
                     # a mere reload (SIGHUP) doesn't seem to make
                     # rsyslog open the files
-                    'restart',
                     'rsyslog',
+                    'restart',
                     ],
                 wait=False,
                 ),
@@ -366,9 +366,9 @@ kern.* -{adir}/syslog/kern.log;RSYSLOG_FileFormat
                     CONF,
                     run.Raw('&&'),
                     'sudo',
-                    'initctl',
-                    'restart',
+                    'service',
                     'rsyslog',
+                    'restart',
                     ],
                 wait=False,
                 ),