run: Allow a job to override config.use_shaman

Signed-off-by: Zack Cerza <zack@redhat.com>

diff --git a/teuthology/run.py b/teuthology/run.py
index 4f4646fd10fb2dfa190b15df04dfee357c4528bd..756fc25c86328ef0926087cd69323de82c50b4d6 100644 (file)
--- a/teuthology/run.py
+++ b/teuthology/run.py
@@ -356,6 +356,11 @@ def main(args):
     if os_version:
         config["os_version"] = os_version
 
+    # If the job has a 'use_shaman' key, use that value to override the global
+    # config's value.
+    if config.get('use_shaman') is not None:
+        teuth_config.use_shaman = config['use_shaman']
+
     # create a FakeNamespace instance that mimics the old argparse way of doing
     # things we do this so we can pass it to run_tasks without porting those
     # tasks to the new way of doing things right now