Take machine_type instead of worker

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

diff --git a/scripts/suite.py b/scripts/suite.py
index cbbd9fd643d2ec3a17b03adae525cf27330a1bd3..52f177211d72f42380b11cc945e33e11f4eeb941 100644 (file)
--- a/scripts/suite.py
+++ b/scripts/suite.py
@@ -40,8 +40,8 @@ optional arguments:
   -l <limit>, --limit <limit>
                          Queue at most this many jobs
                          [default: 0]
-  -w <worker>, --worker <worker>
-                         Which worker to use (type of machine)
+  -m <type>, --machine-type <type>
+                         Machine type
                          [default: plana]
 
 """

diff --git a/teuthology/suite.py b/teuthology/suite.py
index 690e7d965c6c9d87f09019191d98c425e7f7c0de..af8aada922ff28283b7b51be2e5eb2a5f0ef0c8e 100644 (file)
--- a/teuthology/suite.py
+++ b/teuthology/suite.py
@@ -24,7 +24,7 @@ def main(args):
     name = args['--name']
     priority = int(args['--priority'])
     num = int(args['--num'])
-    worker = args['--worker']
+    machine_type = args['--machine-type']
     owner = args['--owner']
     base = args['--base']
     suite = args['--suite']
@@ -36,7 +36,11 @@ def main(args):
         teuthology.log.setLevel(logging.DEBUG)
 
     arch = get_arch(base_yaml_paths)
-    machine_type = get_machine_type(base_yaml_paths)
+
+    if ',' in machine_type:
+        worker = 'multi'
+    else:
+        worker = machine_type
 
     base_args = [
         os.path.join(os.path.dirname(sys.argv[0]), 'teuthology-schedule'),