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 6b7d89b23b9fe9a7f6455f44b3754f1021dc2ede..6bede22629d05f69d5f3f85c6839f14e29946184 100644 (file)
--- 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, \