From 9f46f47b6b2ac7dec4c36c80d14e297f10ab2df3 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 29 Mar 2013 12:16:39 -0700 Subject: [PATCH] run: clean up machine_type thing Signed-off-by: Sage Weil --- teuthology/run.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/teuthology/run.py b/teuthology/run.py index 6b7d89b23b9..6bede22629d 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, \