From: Zack Cerza <zack@redhat.com>
Date: Tue, 27 Oct 2015 20:34:20 +0000 (-0600)
Subject: Allow setting max job time for teuthology
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=639f6817e878985c847d05795ff002d1db551922;p=ceph-cm-ansible.git

Allow setting max job time for teuthology

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

diff --git a/roles/teuthology/templates/teuthology.yaml b/roles/teuthology/templates/teuthology.yaml
index 54ca17b..ee12f4c 100644
--- a/roles/teuthology/templates/teuthology.yaml
+++ b/roles/teuthology/templates/teuthology.yaml
@@ -6,11 +6,11 @@ results_email: {{ teuthology_results_email|default('null') }}
 results_sending_email: {{ teuthology_results_sending_email|default('null') }}
 lab_domain: {{ lab_domain }}
 default_machine_type: {{ teuthology_default_machine_type|default('null') }}
+max_job_time: {{ teuthology_max_job_time|default(129600) }}
 {{ teuthology_yaml_extra }}
 # Not yet configurable via ansible
 archive_server: http://{{ inventory_hostname }}/
 archive_base: /home/teuthworker/archive
 ceph_git_base_url: git://git.ceph.com/
-max_job_time: 129600
 queue_host: localhost
 queue_port: 11300