From: Zack Cerza <zack@cerza.org>
Date: Fri, 11 Oct 2013 22:41:22 +0000 (-0500)
Subject: Put machine_type in config.yaml
X-Git-Tag: 1.1.0~1805^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F133%2Fhead;p=teuthology.git

Put machine_type in config.yaml

Reason being, if --worker is passed to teuthology-schedule, we are
already placing the job in the tube for that machine type. If the job
config doesn't specify a machine_type, it will later be assigned to
'plana' by teuthology-run without actually modifying the config. This
can result in jobs running on hardware other than what was requested.

Signed-off-by: Zack Cerza <zack.cerza@inktank.com>
---

diff --git a/teuthology/schedule.py b/teuthology/schedule.py
index d9b71fe8b..5aa51ed8c 100644
--- a/teuthology/schedule.py
+++ b/teuthology/schedule.py
@@ -47,6 +47,7 @@ def main(ctx):
         description=ctx.description,
         owner=ctx.owner,
         verbose=ctx.verbose,
+        machine_type=ctx.worker,
     )
     # Merge job_config and ctx.config
     job_config.update(ctx.config)