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 <wusui@redhat.com>

diff --git a/teuthology/orchestra/daemon.py b/teuthology/orchestra/daemon.py
index 690aee07bc8b992566a22286348568a97cb147f0..3c40aaa5d4840512541f059e2ab1f3d98387d6d9 100644 (file)
--- 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)