From: Zac Dover <zac.dover@gmail.com>
Date: Tue, 9 Jun 2020 14:15:43 +0000 (+1000)
Subject: doc/cephadm: Import existing ssh key docs.
X-Git-Tag: v16.1.0~2079^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F35504%2Fhead;p=ceph.git

doc/cephadm: Import existing ssh key docs.

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>
---

diff --git a/doc/cephadm/adoption.rst b/doc/cephadm/adoption.rst
index 9444d56704f0..1f15b2c46d5c 100644
--- a/doc/cephadm/adoption.rst
+++ b/doc/cephadm/adoption.rst
@@ -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]
diff --git a/doc/cephadm/troubleshooting.rst b/doc/cephadm/troubleshooting.rst
index 29e36958e09c..891e5e14f1b6 100644
--- a/doc/cephadm/troubleshooting.rst
+++ b/doc/cephadm/troubleshooting.rst
@@ -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
 ----------