From: Zack Cerza <zack@cerza.org>
Date: Tue, 8 Oct 2013 22:02:47 +0000 (-0500)
Subject: Move teuthology-updatekeys' arg parsing to scripts/
X-Git-Tag: 1.1.0~1820
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=755ac2f1293c18a8680b82148d99d59c679ee57b;p=teuthology.git

Move teuthology-updatekeys' arg parsing to scripts/

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

diff --git a/scripts/updatekeys.py b/scripts/updatekeys.py
new file mode 100644
index 000000000..364ac40e9
--- /dev/null
+++ b/scripts/updatekeys.py
@@ -0,0 +1,40 @@
+import argparse
+
+import teuthology.lock
+
+
+def main():
+    teuthology.lock.updatekeys(parse_args())
+
+
+def parse_args():
+    parser = argparse.ArgumentParser(description="""
+Update any hostkeys that have changed. You can list specific machines
+to run on, or use -a to check all of them automatically.
+""")
+    parser.add_argument(
+        '-t', '--targets',
+        default=None,
+        help='input yaml containing targets to check',
+    )
+    parser.add_argument(
+        'machines',
+        metavar='MACHINES',
+        default=[],
+        nargs='*',
+        help='hosts to check for updated keys',
+    )
+    parser.add_argument(
+        '-v', '--verbose',
+        action='store_true',
+        default=False,
+        help='be more verbose',
+    )
+    parser.add_argument(
+        '-a', '--all',
+        action='store_true',
+        default=False,
+        help='update hostkeys of all machines in the db',
+    )
+
+    return parser.parse_args()
diff --git a/setup.py b/setup.py
index f97c9a220..d926cf213 100644
--- a/setup.py
+++ b/setup.py
@@ -23,7 +23,7 @@ setup(
             'teuthology-worker = scripts.worker:main',
             'teuthology-lock = scripts.lock:main',
             'teuthology-schedule = scripts.schedule:main',
-            'teuthology-updatekeys = teuthology.lock:update_hostkeys',
+            'teuthology-updatekeys = scripts.updatekeys:main',
             'teuthology-coverage = teuthology.coverage:analyze',
             'teuthology-results = teuthology.suite:results',
             'teuthology-report = teuthology.report:main',
diff --git a/teuthology/lock.py b/teuthology/lock.py
index a0c8ce466..79dd127c3 100644
--- a/teuthology/lock.py
+++ b/teuthology/lock.py
@@ -306,38 +306,7 @@ def main(ctx):
     return ret
 
 
-def update_hostkeys():
-    parser = argparse.ArgumentParser(description="""
-Update any hostkeys that have changed. You can list specific machines
-to run on, or use -a to check all of them automatically.
-""")
-    parser.add_argument(
-        '-t', '--targets',
-        default=None,
-        help='input yaml containing targets to check',
-    )
-    parser.add_argument(
-        'machines',
-        metavar='MACHINES',
-        default=[],
-        nargs='*',
-        help='hosts to check for updated keys',
-    )
-    parser.add_argument(
-        '-v', '--verbose',
-        action='store_true',
-        default=False,
-        help='be more verbose',
-    )
-    parser.add_argument(
-        '-a', '--all',
-        action='store_true',
-        default=False,
-        help='update hostkeys of all machines in the db',
-    )
-
-    ctx = parser.parse_args()
-
+def updatekeys(ctx):
     loglevel = logging.INFO
     if ctx.verbose:
         loglevel = logging.DEBUG