From 1bf1ce3f9a72cdd4efadeb50d4ca7162e4239c13 Mon Sep 17 00:00:00 2001 From: Iustin Pop <iustin@google.com> Date: Thu, 18 Oct 2012 00:09:32 +0200 Subject: [PATCH] Small improvements to the move-instance doc While reading the docs, I saw that this is not converted to the shell lexer, and that a few other small improvements can be done. Signed-off-by: Iustin Pop <iustin@google.com> Reviewed-by: Helga Velroyen <helgav@google.com> --- doc/move-instance.rst | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/doc/move-instance.rst b/doc/move-instance.rst index d2b6fcfcb..6e616fb6a 100644 --- a/doc/move-instance.rst +++ b/doc/move-instance.rst @@ -31,18 +31,21 @@ can be easily moved between them. By checking the signatures, the destination cluster can be sure the third party (e.g. this tool) didn't modify the received crypto keys and connection information. -.. highlight:: sh +.. highlight:: shell-example To create a new, random cluster domain secret, run the following command on the master node:: - gnt-cluster renew-crypto --new-cluster-domain-secret + $ gnt-cluster renew-crypto --new-cluster-domain-secret -To set the cluster domain secret, run the following command on the -master node:: +To read and set the cluster domain secret from the contents of a file, +run the following command on the master node:: - gnt-cluster renew-crypto --cluster-domain-secret=/.../ganeti.cds + $ gnt-cluster renew-crypto --cluster-domain-secret=%/.../ganeti.cds% + +More information about the ``renew-crypto`` command can be found in +:manpage:`gnt-cluster(8)`. Moving instances @@ -51,7 +54,7 @@ Moving instances As soon as the clusters share a cluster domain secret, instances can be moved. The tool usage is as follows:: - move-instance [options] <source-cluster> <destination-cluster> <instance-name...> + $ move-instance %[options]% %source-cluster% %destination-cluster% %instance-name...% Multiple instances can be moved with one invocation of the instance move tool, though a few options are only available when moving a single @@ -68,7 +71,7 @@ destination-related options default to the source value (e.g. setting PEM format. For self-signed certificates, this is the certificate itself. For certificates signed by a third party CA, the complete chain must be in the file (see documentation for - ``SSL_CTX_load_verify_locations(3)``). + :manpage:`SSL_CTX_load_verify_locations(3)`). ``--src-username``/``--dest-username`` RAPI username, must have write access to cluster. ``--src-password-file``/``--dest-password-file`` -- GitLab