From: Zack Cerza <zack@redhat.com>
Date: Tue, 2 May 2017 17:24:15 +0000 (-0600)
Subject: DaemonGroup: Don't use systemd with valgrind
X-Git-Tag: 1.1.0~384^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=829875b6ff866a99cd4e642869addb19077c8337;p=teuthology.git

DaemonGroup: Don't use systemd with valgrind

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

diff --git a/teuthology/orchestra/daemon/group.py b/teuthology/orchestra/daemon/group.py
index befc9417b..d2979b68b 100644
--- a/teuthology/orchestra/daemon/group.py
+++ b/teuthology/orchestra/daemon/group.py
@@ -55,7 +55,10 @@ class DaemonGroup(object):
             self.daemons[role][id_] = None
         klass = DaemonState
         if remote.init_system == 'systemd':
-            klass = SystemDState
+            # We currently cannot use systemd and valgrind together because
+            # it would require rewriting the unit files
+            if not any(map(lambda i: i == 'valgrind', args)):
+                klass = SystemDState
         self.daemons[role][id_] = klass(
             remote, role, id_, *args, **kwargs)