From: Sage Weil <sage@inktank.com>
Date: Fri, 29 Mar 2013 19:16:39 +0000 (-0700)
Subject: run: clean up machine_type thing
X-Git-Tag: 1.1.0~2213
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=9f46f47b6b2ac7dec4c36c80d14e297f10ab2df3;p=teuthology.git

run: clean up machine_type thing

Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/teuthology/run.py b/teuthology/run.py
index 6b7d89b23b..6bede22629 100644
--- a/teuthology/run.py
+++ b/teuthology/run.py
@@ -103,9 +103,8 @@ def main():
 
     machine_type = ctx.machine_type
     if machine_type is None:
-        machine_type = ctx.config.get('machine-type')
-        if machine_type is None:
-            machine_type = ctx.config.get('machine_type', 'plana')
+        fallback_default = ctx.config.get('machine_type', 'plana')
+        machine_type = ctx.config.get('machine-type', fallback_default)
 
     if ctx.block:
         assert ctx.lock, \