Add combined rbd task that runs all the subparts.

diff --git a/teuthology/task/rbd.py b/teuthology/task/rbd.py
index 06995acf530be6b5baf24eefba8231e48368cecd..b9efb19d2471f6f287fda4de5361f2f3f907eb61 100644 (file)
--- a/teuthology/task/rbd.py
+++ b/teuthology/task/rbd.py
@@ -3,6 +3,7 @@ import logging
 
 from orchestra import run
 from teuthology import misc as teuthology
+from teuthology import contextutil
 
 log = logging.getLogger(__name__)
 
@@ -315,4 +316,40 @@ def mount(ctx, config):
 
 @contextlib.contextmanager
 def task(ctx, config):
-    create_image(ctx, config)
+    """
+    Create and mount an rbd image.
+
+    For example::
+
+        tasks:
+        - ceph:
+        - rbd: [client.0, client.1]
+
+    Different image options::
+
+        tasks:
+        - ceph:
+        - rbd:
+            client.0: # uses defaults
+            client.1:
+                image_name: foo
+                image_size: 2048
+                fs_type: xfs
+    """
+    assert isinstance(config, list) or isinstance(config, dict), \
+        "task rbd only supports a list or dict for configuration"
+    if isinstance(config, dict):
+        role_images = {}
+        for role, properties in config.iteritems():
+            role_images[role] = properties.get('image_name')
+    else:
+        role_images = config
+
+    with contextutil.nested(
+        lambda: create_image(ctx=ctx, config=config),
+        lambda: modprobe(ctx=ctx, config=config),
+        lambda: dev_create(ctx=ctx, config=role_images),
+        lambda: mkfs(ctx=ctx, config=config),
+        lambda: mount(ctx=ctx, config=role_images),
+        ):
+        yield