From: Jason Dillaman <dillaman@redhat.com>
Date: Tue, 20 Dec 2016 01:52:06 +0000 (-0500)
Subject: qa/tasks/qemu: support overriding the cloud image
X-Git-Tag: v12.0.0~32^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=67a4a6c519781d968f60e09d136b0527ddfd86d3;p=ceph.git

qa/tasks/qemu: support overriding the cloud image

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
---

diff --git a/qa/tasks/qemu.py b/qa/tasks/qemu.py
index 5cd7d883cdd40..75ea23c4efd46 100644
--- a/qa/tasks/qemu.py
+++ b/qa/tasks/qemu.py
@@ -201,9 +201,10 @@ def download_image(ctx, config):
     for client, client_config in config.iteritems():
         (remote,) = ctx.cluster.only(client).remotes.keys()
         base_file = '{tdir}/qemu/base.{client}.qcow2'.format(tdir=testdir, client=client)
+        image_url = client_config.get('image_url', DEFAULT_IMAGE_URL)
         remote.run(
             args=[
-                'wget', '-nv', '-O', base_file, DEFAULT_IMAGE_URL,
+                'wget', '-nv', '-O', base_file, image_url,
                 ]
             )
     try:
@@ -481,6 +482,15 @@ def task(ctx, config):
                         test data
                       type: text/plain
                       filename: /tmp/data
+
+    If you need to override the default cloud image, set image_url:
+
+        tasks:
+        - ceph
+        - qemu:
+            client.0:
+                test: http://ceph.com/qa/test.sh
+                image_url: https://cloud-images.ubuntu.com/releases/16.04/release/ubuntu-16.04-server-cloudimg-amd64-disk1.img
     """
     assert isinstance(config, dict), \
            "task qemu only supports a dictionary for configuration"