From 187803d30596ef334fd08df73d7cbf915911dc5a Mon Sep 17 00:00:00 2001 From: Andrew Schoen Date: Thu, 5 Feb 2015 09:24:05 -0600 Subject: [PATCH] Correctly pull the default machine_type if machine_type is not defined explicitly Signed-off-by: Andrew Schoen --- teuthology/run.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/teuthology/run.py b/teuthology/run.py index 153bd61ba..177730193 100644 --- a/teuthology/run.py +++ b/teuthology/run.py @@ -15,6 +15,7 @@ from .run_tasks import run_tasks from .repo_utils import fetch_qa_suite from .results import email_results from .config import FakeNamespace +from .config import config as teuth_config log = logging.getLogger(__name__) @@ -131,7 +132,8 @@ def get_machine_type(machine_type, config): from the given config. """ if machine_type is None: - fallback_default = config.get('machine_type', 'plana') + fallback_default = config.get('machine_type', + teuth_config.default_machine_type) machine_type = config.get('machine-type', fallback_default) return machine_type -- 2.47.3