From: Warren Usui <warren.usui@inktank.com>
Date: Wed, 13 Mar 2013 23:42:09 +0000 (-0700)
Subject: Use service instead of initctl to restart rsyslog.
X-Git-Tag: 1.1.0~2250
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=01a40cfbf1ca708d942790470312c15d6128da8f;p=teuthology.git

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 21dd047b1c..d3fd8e0dd1 100644
--- 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 e10bfdc4fc..fe3ef35494 100644
--- 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,
                 ),