]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
doc/cephadm: Import existing ssh key docs.
authorZac Dover <zac.dover@gmail.com>
Tue, 9 Jun 2020 14:15:43 +0000 (00:15 +1000)
committerZac Dover <zac.dover@gmail.com>
Tue, 9 Jun 2020 15:52:22 +0000 (01:52 +1000)
This commit supersedes the commit below, which was suggested by
mohnewald:

https://github.com/ceph/ceph/pull/34453/commits/1cd278b08a342df1acf9b43dbc5c27ee686149c0

Co-author: https://github.com/mohnewald

Signed-off-by: Zac Dover <zac.dover@gmail.com>
doc/cephadm/adoption.rst
doc/cephadm/troubleshooting.rst

index 9444d56704f03ceab999669b7133dee72cc906dd..1f15b2c46d5cd951395beaa3e2add524bcb0f244 100644 (file)
@@ -81,6 +81,12 @@ Adoption process
 
      # ssh-copy-id -f -i ceph.pub root@<host>
 
+   .. note::
+     It is also possible to import an existing ssh key. See
+     :ref:`ssh errors <cephadm-ssh-errors>` in the troubleshooting
+     document for instructions describing how to import existing
+     ssh keys.
+
 #. Tell cephadm which hosts to manage::
 
      # ceph orch host add <hostname> [ip-address]
index 29e36958e09c705d712019f97a26766a4ea5d28d..891e5e14f1b67c8a8fe70b303ab665414f90c66f 100644 (file)
@@ -103,6 +103,7 @@ Cephadm writes small wrappers that run a containers. Refer to
 ``/var/lib/ceph/<cluster-fsid>/<service-name>/unit.run`` for the
 container execution command.
 
+.. _cephadm-ssh-errors:
 
 ssh errors
 ----------