From 921f11c0a6b72228cd2d16b7d6be33602d257327 Mon Sep 17 00:00:00 2001
From: Paul Cuzner <pcuzner@redhat.com>
Date: Wed, 16 Sep 2020 13:27:33 +1200
Subject: [PATCH] cephadm: renamed command to exporter to better reflect it's
 purpose

By using the command 'exporter' instead of cephadmd, you better
understand the scope of the daemon

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
---
 src/cephadm/cephadm | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 968848f7947cd..c32de65190e45 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -5478,7 +5478,7 @@ class CephadmDaemon():
         self.http_server.shutdown()
 
     def run(self):
-        logger.info(f"cephadmd starting for FSID '{self.fsid}'")
+        logger.info(f"cephadm exporter starting for FSID '{self.fsid}'")
         if not self.can_run:
             logger.error("Unable to start")
             return
@@ -5526,7 +5526,7 @@ class CephadmDaemon():
     def unit_run(self):
         
         return """set -e 
-{py3} {bin_path} cephadmd --fsid {fsid} --port {port}""".format(
+{py3} {bin_path} exporter --fsid {fsid} --port {port}""".format(
             py3 = shutil.which('python3'),
             bin_path=self.binary_path,
             fsid=self.fsid,
@@ -5536,8 +5536,8 @@ class CephadmDaemon():
     @property
     def unit_file(self):
         return """#generated by cephadm
-        [Unit]
-Description=cephadm data service (web interface) for cluster {fsid}
+[Unit]
+Description=cephadm exporter service for cluster {fsid}
 After=network-online.target
 Wants=network-online.target
 
@@ -5620,14 +5620,14 @@ WantedBy=ceph-{fsid}.target
             stdout, stderr, rc = call(["systemctl", "daemon-reload"])
 
 
-def command_cephadmd():
+def command_exporter():
     
-    cephadmd = CephadmDaemon(args.fsid, args.port)
+    exporter = CephadmDaemon(args.fsid, args.port)
 
     if args.fsid not in os.listdir(args.data_dir):
         raise Error(f"cluster fsid '{args.fsid}' not found in '{args.data_dir}'")
             
-    cephadmd.run()
+    exporter.run()
         
 
 
@@ -6149,19 +6149,19 @@ def _get_parser():
         'gather-facts', help='gather and return host related information (JSON format)')
     parser_gather_facts.set_defaults(func=command_gather_facts)
 
-    parser_cephadmd = subparsers.add_parser(
-        'cephadmd', help='Start cephadm as a web service, providing host/daemon metadata')
-    parser_cephadmd.add_argument(
+    parser_exporter = subparsers.add_parser(
+        'exporter', help='Start cephadm in exporter mode (web service), providing host/daemon/disk metadata')
+    parser_exporter.add_argument(
         '--fsid',
         required=True,
         type=str,
-        help='fsid of the cephadmd to run against')
-    parser_cephadmd.add_argument(
+        help='fsid of the cephadm exporter to run against')
+    parser_exporter.add_argument(
         '--port',
         type=int,
         default=5003,
-        help='port number for the cephadmd service')
-    parser_cephadmd.set_defaults(func=command_cephadmd)
+        help='port number for the cephadm exporter service')
+    parser_exporter.set_defaults(func=command_exporter)
 
     return parser
 
-- 
2.39.5