From 228665b5db0da288a94dd630c8f3c151729f47f9 Mon Sep 17 00:00:00 2001 From: Warren Usui Date: Tue, 28 Jun 2016 19:43:10 -0700 Subject: [PATCH] Fix resolve_role_list in daemon.py resolve_role_list did not handle cases where roles specified contained wild-cards or were not specified. ceph.role.a would end up being resolved as ceph.rolea. Fixes: tracker issue 16053 Signed-off-by: Warren Usui --- teuthology/orchestra/daemon.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/teuthology/orchestra/daemon.py b/teuthology/orchestra/daemon.py index 690aee07b..3c40aaa5d 100644 --- a/teuthology/orchestra/daemon.py +++ b/teuthology/orchestra/daemon.py @@ -238,7 +238,7 @@ class DaemonGroup(object): prefix = type_ if cluster_aware: prefix = daemon.role - resolved.append(prefix + daemon.id_) + resolved.append(prefix + '.' + daemon.id_) else: # Handle explicit list of roles or wildcards for raw_role in roles: @@ -256,7 +256,7 @@ class DaemonGroup(object): prefix = role_type if cluster_aware: prefix = daemon.role - resolved.append(prefix + daemon.id_) + resolved.append(prefix + '.' + daemon.id_) else: # Handle explicit role resolved.append(raw_role) -- 2.47.3