]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
In find_job_info(), also look for orig.config.yaml
authorZack Cerza <zack@cerza.org>
Wed, 26 Feb 2014 19:13:41 +0000 (13:13 -0600)
committerZack Cerza <zack@cerza.org>
Wed, 26 Feb 2014 19:13:41 +0000 (13:13 -0600)
Signed-off-by: Zack Cerza <zack.cerza@inktank.com>
teuthology/kill.py

index 402643488f54a7c8656f69a9b930a2f0902db734..698ef5614f6cca255864585ff38d42255da24830 100755 (executable)
@@ -87,6 +87,11 @@ def find_job_info(job_archive_dir):
     conf_file = os.path.join(job_archive_dir, 'config.yaml')
     if os.path.isfile(conf_file):
         job_info.update(yaml.safe_load(open(conf_file, 'r')))
+    else:
+        conf_file = os.path.join(job_archive_dir, 'orig.config.yaml')
+        if os.path.isfile(conf_file):
+            log.debug("config.yaml not found but orig.config.yaml found")
+            job_info.update(yaml.safe_load(open(conf_file, 'r')))
 
     return job_info