DaemonState: Use consistent daemon IDs

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

diff --git a/teuthology/orchestra/daemon.py b/teuthology/orchestra/daemon.py
index 99353ed5b78673cf799e73a967013af9fa38ed49..989263b50bf15bc83aa724d0df2d5d924a99954b 100644 (file)
--- a/teuthology/orchestra/daemon.py
+++ b/teuthology/orchestra/daemon.py
@@ -47,9 +47,6 @@ class DaemonState(object):
         self.id_ = id_
         self.use_init = use_init
         if self.use_init:
-            _, role = role.split('.')
-            if (role == 'mon') or (role == 'mds') or (role == 'rgw'):
-                self.id_ = remote.shortname
             self._set_commands()
         self.log = command_kwargs.get('logger', log)
         self.proc = None