From: Warren Usui <wusui@redhat.com>
Date: Wed, 29 Jun 2016 02:43:10 +0000 (-0700)
Subject: Fix resolve_role_list in daemon.py
X-Git-Tag: 1.1.0~578^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F890%2Fhead;p=teuthology.git

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 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)