]> git-server-git.apps.pok.os.sepia.ceph.com Git - teuthology.git/commitdiff
Correctly pull the default machine_type if machine_type is not defined explicitly 426/head
authorAndrew Schoen <aschoen@redhat.com>
Thu, 5 Feb 2015 15:24:05 +0000 (09:24 -0600)
committerAndrew Schoen <aschoen@redhat.com>
Thu, 5 Feb 2015 20:19:24 +0000 (14:19 -0600)
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
teuthology/run.py

index 153bd61ba6ef46386183b1d4d0fb72f324988ef2..177730193ee529fbbc618009ceeb291264542b74 100644 (file)
@@ -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