rename c* -> ceph-*

Leave cfuse task name unchanged for now...

diff --git a/teuthology/misc.py b/teuthology/misc.py
index b765eaa4bc831d425b5efcc573ef89bc73338232..488c0a3ffcd44d8043aa75d6731892e018425029 100644 (file)
--- a/teuthology/misc.py
+++ b/teuthology/misc.py
@@ -334,7 +334,7 @@ def write_secret_file(remote, role, filename):
             '/tmp/cephtest/enable-coredump',
             '/tmp/cephtest/binary/usr/local/bin/ceph-coverage',
             '/tmp/cephtest/archive/coverage',
-            '/tmp/cephtest/binary/usr/local/bin/cauthtool',
+            '/tmp/cephtest/binary/usr/local/bin/ceph-authtool',
             '--name={role}'.format(role=role),
             '--print-key',
             '/tmp/cephtest/data/{role}.keyring'.format(role=role),

diff --git a/teuthology/nuke.py b/teuthology/nuke.py
index 5335cca18e44ee94b4f346247bb6364103fff241..f732f94379a4f402a5e2217733fd6e0cbaa323bb 100644 (file)
--- a/teuthology/nuke.py
+++ b/teuthology/nuke.py
@@ -60,10 +60,10 @@ def shutdown_daemons(ctx, log):
                 run.Raw(';'),
                 'killall',
                 '--quiet',
-                '/tmp/cephtest/binary/usr/local/bin/cmon',
-                '/tmp/cephtest/binary/usr/local/bin/cosd',
-                '/tmp/cephtest/binary/usr/local/bin/cmds',
-                '/tmp/cephtest/binary/usr/local/bin/cfuse',
+                '/tmp/cephtest/binary/usr/local/bin/ceph-mon',
+                '/tmp/cephtest/binary/usr/local/bin/ceph-osd',
+                '/tmp/cephtest/binary/usr/local/bin/ceph-mds',
+                '/tmp/cephtest/binary/usr/local/bin/ceph-fuse',
                 run.Raw(';'),
                 'if', 'test', '-e', '/etc/rsyslog.d/80-cephtest.conf',
                 run.Raw(';'),

diff --git a/teuthology/task/ceph.py b/teuthology/task/ceph.py
index ca3b7aa7992e334bc327da142a37d812146f9174..61841b4732531d560b37b255ba048a06888c7f17 100644 (file)
--- a/teuthology/task/ceph.py
+++ b/teuthology/task/ceph.py
@@ -340,7 +340,7 @@ def cluster(ctx, config):
             '/tmp/cephtest/enable-coredump',
             '/tmp/cephtest/binary/usr/local/bin/ceph-coverage',
             coverage_dir,
-            '/tmp/cephtest/binary/usr/local/bin/cauthtool',
+            '/tmp/cephtest/binary/usr/local/bin/ceph-authtool',
             '--create-keyring',
             '/tmp/cephtest/ceph.keyring',
             ],
@@ -350,7 +350,7 @@ def cluster(ctx, config):
             '/tmp/cephtest/enable-coredump',
             '/tmp/cephtest/binary/usr/local/bin/ceph-coverage',
             coverage_dir,
-            '/tmp/cephtest/binary/usr/local/bin/cauthtool',
+            '/tmp/cephtest/binary/usr/local/bin/ceph-authtool',
             '--gen-key',
             '--name=mon.',
             '/tmp/cephtest/ceph.keyring',
@@ -368,7 +368,7 @@ def cluster(ctx, config):
             '/tmp/cephtest/enable-coredump',
             '/tmp/cephtest/binary/usr/local/bin/ceph-coverage',
             coverage_dir,
-            '/tmp/cephtest/binary/usr/local/bin/cauthtool',
+            '/tmp/cephtest/binary/usr/local/bin/ceph-authtool',
             '--gen-key',
             '--name=client.admin',
             '--set-uid=0',
@@ -433,7 +433,7 @@ def cluster(ctx, config):
                     '/tmp/cephtest/enable-coredump',
                     '/tmp/cephtest/binary/usr/local/bin/ceph-coverage',
                     coverage_dir,
-                    '/tmp/cephtest/binary/usr/local/bin/cauthtool',
+                    '/tmp/cephtest/binary/usr/local/bin/ceph-authtool',
                     '--create-keyring',
                     '--gen-key',
                     '--name=osd.{id}'.format(id=id_),
@@ -450,7 +450,7 @@ def cluster(ctx, config):
                     '/tmp/cephtest/enable-coredump',
                     '/tmp/cephtest/binary/usr/local/bin/ceph-coverage',
                     coverage_dir,
-                    '/tmp/cephtest/binary/usr/local/bin/cauthtool',
+                    '/tmp/cephtest/binary/usr/local/bin/ceph-authtool',
                     '--create-keyring',
                     '--gen-key',
                     '--name=mds.{id}'.format(id=id_),
@@ -467,7 +467,7 @@ def cluster(ctx, config):
                     '/tmp/cephtest/enable-coredump',
                     '/tmp/cephtest/binary/usr/local/bin/ceph-coverage',
                     coverage_dir,
-                    '/tmp/cephtest/binary/usr/local/bin/cauthtool',
+                    '/tmp/cephtest/binary/usr/local/bin/ceph-authtool',
                     '--create-keyring',
                     '--gen-key',
                     # TODO this --name= is not really obeyed, all unknown "types" are munged to "client"
@@ -512,7 +512,7 @@ def cluster(ctx, config):
                     '/tmp/cephtest/enable-coredump',
                     '/tmp/cephtest/binary/usr/local/bin/ceph-coverage',
                     coverage_dir,
-                    '/tmp/cephtest/binary/usr/local/bin/cauthtool',
+                    '/tmp/cephtest/binary/usr/local/bin/ceph-authtool',
                     '/tmp/cephtest/ceph.keyring',
                     '--name={type}.{id}'.format(
                         type=type_,
@@ -531,7 +531,7 @@ def cluster(ctx, config):
                     '/tmp/cephtest/enable-coredump',
                     '/tmp/cephtest/binary/usr/local/bin/ceph-coverage',
                     coverage_dir,
-                    '/tmp/cephtest/binary/usr/local/bin/cmon',
+                    '/tmp/cephtest/binary/usr/local/bin/ceph-mon',
                     '--mkfs',
                     '-i', id_,
                     '-c', '/tmp/cephtest/ceph.conf',
@@ -555,7 +555,7 @@ def cluster(ctx, config):
                     '/tmp/cephtest/enable-coredump',
                     '/tmp/cephtest/binary/usr/local/bin/ceph-coverage',
                     coverage_dir,
-                    '/tmp/cephtest/binary/usr/local/bin/cosd',
+                    '/tmp/cephtest/binary/usr/local/bin/ceph-osd',
                     '--mkfs',
                     '-i', id_,
                     '-c', '/tmp/cephtest/ceph.conf',
@@ -643,7 +643,7 @@ def mon(ctx, config):
                     '/tmp/cephtest/daemon-helper'
                        ]
 
-            run_cmd_tail = ['/tmp/cephtest/binary/usr/local/bin/cmon',
+            run_cmd_tail = ['/tmp/cephtest/binary/usr/local/bin/ceph-mon',
                     '-f',
                     '-i', id_,
                     '-c', '/tmp/cephtest/ceph.conf']
@@ -698,7 +698,7 @@ def osd(ctx, config):
                        '/tmp/cephtest/daemon-helper'
                        ]
             proc_signal = daemon_signal
-            run_cmd_tail = [ '/tmp/cephtest/binary/usr/local/bin/cosd',
+            run_cmd_tail = [ '/tmp/cephtest/binary/usr/local/bin/ceph-osd',
                              '-f',
                              '-i', id_,
                              '-c', '/tmp/cephtest/ceph.conf',
@@ -756,7 +756,7 @@ def mds(ctx, config):
                        '/tmp/cephtest/daemon-helper'
                        ]
             proc_signal = daemon_signal
-            run_cmd_tail = ['/tmp/cephtest/binary/usr/local/bin/cmds',
+            run_cmd_tail = ['/tmp/cephtest/binary/usr/local/bin/ceph-mds',
                             '-f',
                             '-i', id_,
                             '-c', '/tmp/cephtest/ceph.conf',

diff --git a/teuthology/task/cfuse.py b/teuthology/task/cfuse.py
index d3397bd9a78173d56fdc00c153209d4f3f8d198c..2a448ca84f7ca7346a165c8146bb43a259d0b338 100644 (file)
--- a/teuthology/task/cfuse.py
+++ b/teuthology/task/cfuse.py
@@ -10,12 +10,12 @@ log = logging.getLogger(__name__)
 @contextlib.contextmanager
 def task(ctx, config):
     """
-    Mount/unmount a ``cfuse`` client.
+    Mount/unmount a ``ceph-fuse`` client.
 
     The config is optional and defaults to mounting on all clients. If
     a config is given, it is expected to be a list of clients to do
     this operation on. This lets you e.g. set up one client with
-    ``cfuse`` and another with ``kclient``.
+    ``ceph-fuse`` and another with ``kclient``.
 
     Example that mounts all clients::
 
@@ -42,7 +42,7 @@ def task(ctx, config):
         - interactive:
 
     """
-    log.info('Mounting cfuse clients...')
+    log.info('Mounting ceph-fuse clients...')
     cfuse_daemons = {}
 
     if config is None:
@@ -55,7 +55,7 @@ def task(ctx, config):
 
     for id_, remote in clients:
         mnt = os.path.join('/tmp/cephtest', 'mnt.{id}'.format(id=id_))
-        log.info('Mounting cfuse client.{id} at {remote} {mnt}...'.format(
+        log.info('Mounting ceph-fuse client.{id} at {remote} {mnt}...'.format(
                 id=id_, remote=remote,mnt=mnt))
 
         client_config = config.get("client.%s" % id_)
@@ -83,11 +83,11 @@ def task(ctx, config):
             '/tmp/cephtest/daemon-helper',
             ]
         run_cmd_tail=[
-            '/tmp/cephtest/binary/usr/local/bin/cfuse',
+            '/tmp/cephtest/binary/usr/local/bin/ceph-fuse',
             '-f',
             '--name', 'client.{id}'.format(id=id_),
             '-c', '/tmp/cephtest/ceph.conf',
-            # TODO cfuse doesn't understand dash dash '--',
+            # TODO ceph-fuse doesn't understand dash dash '--',
             mnt,
             ]
 
@@ -133,7 +133,7 @@ def task(ctx, config):
     try:
         yield
     finally:
-        log.info('Unmounting cfuse clients...')
+        log.info('Unmounting ceph-fuse clients...')
         for id_, remote in clients:
             mnt = os.path.join('/tmp/cephtest', 'mnt.{id}'.format(id=id_))
             remote.run(

diff --git a/teuthology/task/kclient.py b/teuthology/task/kclient.py
index 97ed0c83e65ac07ffc3b7c8af9e437ed25eeba49..e2e88dc3f33adf9bd8f91558db56bacac01033fa 100644 (file)
--- a/teuthology/task/kclient.py
+++ b/teuthology/task/kclient.py
@@ -14,7 +14,7 @@ def task(ctx, config):
     The config is optional and defaults to mounting on all clients. If
     a config is given, it is expected to be a list of clients to do
     this operation on. This lets you e.g. set up one client with
-    ``cfuse`` and another with ``kclient``.
+    ``ceph-fuse`` and another with ``kclient``.
 
     Example that mounts all clients::
 

diff --git a/teuthology/task/rbd.py b/teuthology/task/rbd.py
index 0b5a7eff738065f6b6251e17fb0af983392e692b..5bc1697733b3706f3c4378890bab3c87ae42c889 100644 (file)
--- a/teuthology/task/rbd.py
+++ b/teuthology/task/rbd.py
@@ -147,7 +147,7 @@ def dev_create(ctx, config):
         remote.run(
             args=[
                 'echo',
-                'KERNEL=="rbd[0-9]*", PROGRAM="/tmp/cephtest/binary/usr/local/bin/crbdnamer %n", SYMLINK+="rbd/%c{1}/%c{2}"',
+                'KERNEL=="rbd[0-9]*", PROGRAM="/tmp/cephtest/binary/usr/local/bin/ceph-rbdnamer %n", SYMLINK+="rbd/%c{1}/%c{2}"',
                 run.Raw('>'),
                 '/tmp/cephtest/51-rbd.rules',
                 ],