]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
fix up dist var
authorSage Weil <sage@newdream.net>
Fri, 1 Jun 2012 04:39:33 +0000 (21:39 -0700)
committerSage Weil <sage@newdream.net>
Fri, 1 Jun 2012 04:39:33 +0000 (21:39 -0700)
This lets you override the default (now precise) in the ceph config yaml,
e.g.

- ceph:
    dist: oneiric
    branch: master

teuthology/task/ceph.py

index 07ddd17a7ce8a47f027c1632e794ca524fad7b6d..eb4119ed4b8ca0d53145949af1592d102cac9348 100644 (file)
@@ -197,7 +197,7 @@ def binaries(ctx, config):
             sha1=config.get('sha1'),
             flavor=config.get('flavor'),
             format=config.get('format'),
-            dist=dist,
+            dist=config.get('dist'),
             arch=config.get('arch'),
             )
         ctx.summary['ceph-sha1'] = sha1
@@ -1008,7 +1008,7 @@ def task(ctx, config):
                 sha1=config.get('sha1'),
                 path=config.get('path'),
                 flavor=flavor,
-                dist=dist,
+                dist=config.get('dist', dist),
                 format=format,
                 arch=arch
                 )),