From: John Spray <jspray@redhat.com>
Date: Wed, 27 Aug 2014 21:19:52 +0000 (+0100)
Subject: orchestra: more docstring
X-Git-Tag: 1.1.0~1194^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=daeca276aba47541bf408f71b50efe276bdbdd86;p=teuthology.git

orchestra: more docstring

Signed-off-by: John Spray <john.spray@redhat.com>
---

diff --git a/teuthology/orchestra/daemon.py b/teuthology/orchestra/daemon.py
index 70892b4b5..c35882ca1 100644
--- a/teuthology/orchestra/daemon.py
+++ b/teuthology/orchestra/daemon.py
@@ -184,11 +184,13 @@ class DaemonGroup(object):
         ::
 
             # Passing None (i.e. user left config blank) defaults to all roles (filtered by ``types``)
-            None -> ['osd.0', 'osd.1', 'osd.2', 'mds.a', mds.b', 'mon.a']
+            None, types=['osd', 'mds', 'mon'] -> ['osd.0', 'osd.1', 'osd.2', 'mds.a', mds.b', 'mon.a']
             # Wildcards are expanded
-            roles=['mds.*', 'osd.0'] -> ['mds.a', 'mds.b', 'osd.0']
+            roles=['mds.*', 'osd.0'], types=['osd', 'mds', 'mon'] -> ['mds.a', 'mds.b', 'osd.0']
             # Boring lists are unaltered
-            roles=['osd.0', 'mds.a'] -> ['osd.0', 'mds.a']
+            roles=['osd.0', 'mds.a'], types=['osd', 'mds', 'mon'] -> ['osd.0', 'mds.a']
+            # Entries in role list that don't match types result in an exception
+            roles=['osd.0', 'mds.a'], types=['osd'] -> RuntimeError
 
         :param roles: List (of roles or wildcards) or None (select all suitable roles)
         :param types: List of acceptable role types, for example ['osd', 'mds'].