From 1027b01fa6d6e5028a4d939d0ff7f041862a8758 Mon Sep 17 00:00:00 2001
From: Guido Trotter <ultrotter@google.com>
Date: Mon, 17 Oct 2011 16:46:20 +0100
Subject: [PATCH] Revert "Updated man pages with new SPICE TLS options"
This reverts commit b8a10435271ec4457cdc254e0a6b466b2d3bff24.
This commit will be readded on master.
Signed-off-by: Guido Trotter <ultrotter@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>
---
man/gnt-cluster.rst | 8 --------
man/gnt-instance.rst | 6 ------
2 files changed, 14 deletions(-)
diff --git a/man/gnt-cluster.rst b/man/gnt-cluster.rst
index b9b26c91d..250250d56 100644
--- a/man/gnt-cluster.rst
+++ b/man/gnt-cluster.rst
@@ -539,8 +539,6 @@ RENEW-CRYPTO
| **renew-crypto** [-f]
| [--new-cluster-certificate] [--new-confd-hmac-key]
| [--new-rapi-certificate] [--rapi-certificate *rapi-cert*]
-| [--new-spice-certificate | --spice-certificate *spice-cert*
-| -- spice-ca-certificate *spice-ca-cert*]
| [--new-cluster-domain-secret] [--cluster-domain-secret *filename*]
This command will stop all Ganeti daemons in the cluster and start
@@ -554,12 +552,6 @@ ganeti-rapi(8)) specify ``--new-rapi-certificate``. If you want to
use your own certificate, e.g. one signed by a certificate
authority (CA), pass its filename to ``--rapi-certificate``.
-To generate a new self-signed SPICE certificate, used by SPICE
-connections to the KVM hypervisor, specify the
-``--new-spice-certificate`` option. If you want to provide a
-certificate, pass its filename to ``--spice-certificate`` and pass the
-signing CA certificate to ``--spice-ca-certificate``.
-
``--new-cluster-domain-secret`` generates a new, random cluster
domain secret. ``--cluster-domain-secret`` reads the secret from a
file. The cluster domain secret is used to sign information
diff --git a/man/gnt-instance.rst b/man/gnt-instance.rst
index 16bf89baf..9ae83c21b 100644
--- a/man/gnt-instance.rst
+++ b/man/gnt-instance.rst
@@ -353,12 +353,6 @@ spice\_playback\_compression
Configures whether SPICE should compress audio streams or not.
-spice\_use\_tls
- Valid for the KVM hypervisor.
-
- Specifies that the SPICE server must use TLS to encrypt all the
- traffic with the client.
-
acpi
Valid for the Xen HVM and KVM hypervisors.
--
GitLab