From: Shraddha Agrawal <shraddha.agrawal000@gmail.com>
Date: Thu, 13 Aug 2020 12:11:11 +0000 (+0530)
Subject: dispatcher:rename --config-file to --job-config
X-Git-Tag: 1.1.0~17^2~16
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=cc937a151775b1d139684e5863e0887dba9e5c3f;p=teuthology.git

dispatcher:rename --config-file to --job-config

Signed-off-by: Shraddha Agrawal <shraddha.agrawal000@gmail.com>
---

diff --git a/scripts/dispatcher.py b/scripts/dispatcher.py
index bdba50ef1d..db24636964 100644
--- a/scripts/dispatcher.py
+++ b/scripts/dispatcher.py
@@ -1,6 +1,6 @@
 """
 usage: teuthology-dispatcher --help
-       teuthology-dispatcher --supervisor [-v] --bin-path BIN_PATH --config-file COFNFIG --archive-dir ARC_DIR
+       teuthology-dispatcher --supervisor [-v] --bin-path BIN_PATH --job-config COFNFIG --archive-dir ARC_DIR
        teuthology-dispatcher [-v] --archive-dir ARC_DIR --log-dir LOG_DIR --tube TUBE
 
 Start a dispatcher for the specified tube. Grab jobs from a beanstalk
@@ -20,7 +20,7 @@ standard arguments:
   --archive-dir ARC_DIR          path to archive results in
   --supervisor                   run dispactcher in job supervisor mode
   --bin-path BIN_PATH            teuthology bin path
-  --config-file CONFIG                 file descriptor of job's config file
+  --job-config CONFIG                 file descriptor of job's config file
 """
 
 import docopt
diff --git a/teuthology/dispatcher/__init__.py b/teuthology/dispatcher/__init__.py
index 3a9443b6e5..df5b7e83c4 100644
--- a/teuthology/dispatcher/__init__.py
+++ b/teuthology/dispatcher/__init__.py
@@ -145,7 +145,7 @@ def main(args):
         with open(job_config_path, 'w') as f:
             yaml.safe_dump(job_config, f, default_flow_style=False)
 
-        run_args.extend(["--config-file", job_config_path])
+        run_args.extend(["--job-config", job_config_path])
         job_proc = subprocess.Popen(run_args)
         log.info('Job supervisor PID: %s', job_proc.pid)
 
diff --git a/teuthology/dispatcher/supervisor.py b/teuthology/dispatcher/supervisor.py
index 5bbca9c864..71a0f498ff 100644
--- a/teuthology/dispatcher/supervisor.py
+++ b/teuthology/dispatcher/supervisor.py
@@ -25,7 +25,7 @@ def main(args):
     verbose = args["--verbose"]
     archive_dir = args["--archive-dir"]
     teuth_bin_path = args["--bin-path"]
-    config_file_path = args["--config-file"]
+    config_file_path = args["--job-config"]
 
     with open(config_file_path, 'r') as config_file:
         job_config = yaml.safe_load(config_file)