Make -a optional

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

diff --git a/scripts/kill.py b/scripts/kill.py
index d15099306c3cc6886aa91f6e5bb0c5493fc33718..60c235a22306501d7622c0075e8582ab7d2972a5 100644 (file)
--- a/scripts/kill.py
+++ b/scripts/kill.py
@@ -1,9 +1,10 @@
 import docopt
 
+import teuthology.config
 import teuthology.kill
 
 doc = """
-usage: teuthology-kill [-h] -a ARCHIVE -s SUITE
+usage: teuthology-kill [-h] [-a ARCHIVE] -s SUITE
        teuthology-kill [-h] -o OWNER -m MACHINE_TYPE -s SUITE
 
 Kill running teuthology jobs:
@@ -15,11 +16,12 @@ optional arguments:
   -h, --help            show this help message and exit
   -a ARCHIVE, --archive ARCHIVE
                         The base archive directory
+                        [default: {archive_base}]
   -s, --suite SUITE     The name(s) of the suite(s) to kill
   -o, --owner OWNER     The owner of the job(s)
   -m, --machine_type MACHINE_TYPE
                         The type of machine the job(s) are running on
-"""
+""".format(archive_base=teuthology.config.config.archive_base)
 
 
 def main():

diff --git a/teuthology/config.py b/teuthology/config.py
index 635571d4fb2b457e7704230d48337e27911ff553..e5c3518d9b8bff325d26a0837f63fd80fba9cea5 100644 (file)
--- a/teuthology/config.py
+++ b/teuthology/config.py
@@ -13,6 +13,7 @@ class Config(object):
     """
     teuthology_yaml = os.path.join(os.environ['HOME'], '.teuthology.yaml')
     defaults = {
+        'archive_base': '/var/lib/teuthworker/archive',
         'ceph_git_base_url': 'https://github.com/ceph/',
         'lock_server': 'http://teuthology.front.sepia.ceph.com/locker/lock',
         'verify_host_keys': True,