run: machine-type: foo, not machine_type: foo

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

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