From 7bafaa0eed76e88e5b56551f529092a3e2df92e0 Mon Sep 17 00:00:00 2001 From: Zack Cerza Date: Tue, 18 Apr 2017 14:44:46 -0600 Subject: [PATCH] DaemonState: Drop use of self.id ... we already had self.id_ Signed-off-by: Zack Cerza --- teuthology/orchestra/daemon.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/teuthology/orchestra/daemon.py b/teuthology/orchestra/daemon.py index ba7368119c..b5944249c1 100644 --- a/teuthology/orchestra/daemon.py +++ b/teuthology/orchestra/daemon.py @@ -49,7 +49,7 @@ class DaemonState(object): if self.use_init: _, role = role.split('.') if (role == 'mon') or (role == 'mds') or (role == 'rgw'): - self.id = remote.shortname + self.id_ = remote.shortname self._set_commands() self.log = command_kwargs.get('logger', log) self.proc = None @@ -66,8 +66,8 @@ class DaemonState(object): """ if not self.use_init: raise NotImplementedError - proc_name = 'ceph-%s' % self.role - proc_regex = '"%s.*--id %s"' % (proc_name, self.id) + proc_name = 'ceph-%s' % self.type_ + proc_regex = '"%s.*--id %s"' % (proc_name, self.id_) args = ['ps', '-ef', run.Raw('|'), 'grep', -- 2.39.5