]> git-server-git.apps.pok.os.sepia.ceph.com Git - teuthology.git/commitdiff
DaemonGroup: Don't use systemd with valgrind
authorZack Cerza <zack@redhat.com>
Tue, 2 May 2017 17:24:15 +0000 (11:24 -0600)
committerZack Cerza <zack@redhat.com>
Thu, 21 Sep 2017 18:49:10 +0000 (12:49 -0600)
Signed-off-by: Zack Cerza <zack@redhat.com>
teuthology/orchestra/daemon/group.py

index befc9417b7ab055fdc121e4284f9d0d7e9278924..d2979b68bf53bd87d100f80d9e907ca38ddfbea7 100644 (file)
@@ -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)