From: John Spray <john.spray@redhat.com>
Date: Wed, 19 Oct 2016 12:07:48 +0000 (+0100)
Subject: misc: remove generate_caps
X-Git-Tag: 1.1.0~493^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=1719f4bfeb7e098177de4cc67dea560e17eec82b;p=teuthology.git

misc: remove generate_caps

This is moved to ceph-qa-suite.

Fixes: http://tracker.ceph.com/issues/17614
Signed-off-by: John Spray <john.spray@redhat.com>
---

diff --git a/teuthology/misc.py b/teuthology/misc.py
index 7fad219c9b..e2946d6465 100644
--- a/teuthology/misc.py
+++ b/teuthology/misc.py
@@ -291,34 +291,6 @@ def get_mons(roles, ips):
     return mons
 
 
-def generate_caps(type_):
-    """
-    Each call will return the next capability for each system type
-    (essentially a subset of possible role values).  Valid types are osd,
-    mds and client.
-    """
-    defaults = dict(
-        osd=dict(
-            mon='allow *',
-            osd='allow *',
-        ),
-        mds=dict(
-            mon='allow *',
-            osd='allow *',
-            mds='allow',
-        ),
-        client=dict(
-            mon='allow rw',
-            osd='allow rwx',
-            mds='allow',
-        ),
-    )
-    for subsystem, capability in defaults[type_].items():
-        yield '--cap'
-        yield subsystem
-        yield capability
-
-
 def skeleton_config(ctx, roles, ips, cluster='ceph'):
     """
     Returns a ConfigObj that is prefilled with a skeleton config.