|
 |
9119d9 |
From 8eb0db45ab482868736bff1be85bd604d0d97fc5 Mon Sep 17 00:00:00 2001
|
|
|
9119d9 |
Message-Id: <8eb0db45ab482868736bff1be85bd604d0d97fc5@dist-git>
|
|
|
9119d9 |
From: Peter Krempa <pkrempa@redhat.com>
|
|
|
9119d9 |
Date: Fri, 21 Nov 2014 15:04:03 +0100
|
|
|
9119d9 |
Subject: [PATCH] docs: domain: Move docs for storage hosts under the <source>
|
|
|
9119d9 |
element
|
|
|
9119d9 |
|
|
|
9119d9 |
https://bugzilla.redhat.com/show_bug.cgi?id=1164528
|
|
|
9119d9 |
|
|
|
9119d9 |
The docs describing the <host> element that are under the <source>
|
|
|
9119d9 |
element in the XML document were incorrectly placed under the <disk>
|
|
|
9119d9 |
element. Move them to the correct place.
|
|
|
9119d9 |
|
|
|
9119d9 |
(cherry picked from commit 33b282eadc9a9bd69f2f0d12360d3be0a772eafe)
|
|
|
9119d9 |
|
|
|
9119d9 |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
9119d9 |
---
|
|
|
9119d9 |
docs/formatdomain.html.in | 109 +++++++++++++++++++++++++---------------------
|
|
|
9119d9 |
1 file changed, 59 insertions(+), 50 deletions(-)
|
|
|
9119d9 |
|
|
|
9119d9 |
diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
|
|
|
9119d9 |
index 138b5e1..a458067 100644
|
|
|
9119d9 |
--- a/docs/formatdomain.html.in
|
|
|
9119d9 |
+++ b/docs/formatdomain.html.in
|
|
|
9119d9 |
@@ -1938,6 +1938,65 @@
|
|
|
9119d9 |
may have zero or more host sub-elements used to
|
|
|
9119d9 |
specify the hosts to connect.
|
|
|
9119d9 |
|
|
|
9119d9 |
+
|
|
|
9119d9 |
+
|
|
|
9119d9 |
+ host
|
|
|
9119d9 |
+
|
|
|
9119d9 |
+
|
|
|
9119d9 |
+ The host element supports 4 attributes, viz. "name",
|
|
|
9119d9 |
+ "port", "transport" and "socket", which specify the hostname,
|
|
|
9119d9 |
+ the port number, transport type and path to socket, respectively.
|
|
|
9119d9 |
+ The meaning of this element and the number of the elements depend
|
|
|
9119d9 |
+ on the protocol attribute.
|
|
|
9119d9 |
+
|
|
|
9119d9 |
+
|
|
|
9119d9 |
+
|
|
|
9119d9 |
+ Protocol
|
|
|
9119d9 |
+ Meaning
|
|
|
9119d9 |
+ Number of hosts
|
|
|
9119d9 |
+ Default port
|
|
|
9119d9 |
+
|
|
|
9119d9 |
+
|
|
|
9119d9 |
+ nbd
|
|
|
9119d9 |
+ a server running nbd-server
|
|
|
9119d9 |
+ only one
|
|
|
9119d9 |
+ 10809
|
|
|
9119d9 |
+
|
|
|
9119d9 |
+
|
|
|
9119d9 |
+ iscsi
|
|
|
9119d9 |
+ an iSCSI server
|
|
|
9119d9 |
+ only one
|
|
|
9119d9 |
+ 3260
|
|
|
9119d9 |
+
|
|
|
9119d9 |
+
|
|
|
9119d9 |
+ rbd
|
|
|
9119d9 |
+ monitor servers of RBD
|
|
|
9119d9 |
+ one or more
|
|
|
9119d9 |
+ 6789
|
|
|
9119d9 |
+
|
|
|
9119d9 |
+
|
|
|
9119d9 |
+ sheepdog
|
|
|
9119d9 |
+ one of the sheepdog servers (default is localhost:7000)
|
|
|
9119d9 |
+ zero or one
|
|
|
9119d9 |
+ 7000
|
|
|
9119d9 |
+
|
|
|
9119d9 |
+
|
|
|
9119d9 |
+ gluster
|
|
|
9119d9 |
+ a server running glusterd daemon
|
|
|
9119d9 |
+ only one
|
|
|
9119d9 |
+ 24007
|
|
|
9119d9 |
+
|
|
|
9119d9 |
+
|
|
|
9119d9 |
+
|
|
|
9119d9 |
+ gluster supports "tcp", "rdma", "unix" as valid values for the
|
|
|
9119d9 |
+ transport attribute. nbd supports "tcp" and "unix". Others only
|
|
|
9119d9 |
+ support "tcp". If nothing is specified, "tcp" is assumed. If the
|
|
|
9119d9 |
+ transport is "unix", the socket attribute specifies the path to an
|
|
|
9119d9 |
+ AF_UNIX socket.
|
|
|
9119d9 |
+
|
|
|
9119d9 |
+
|
|
|
9119d9 |
+
|
|
|
9119d9 |
+
|
|
|
9119d9 |
|
|
|
9119d9 |
For a "file" or "volume" disk type which represents a cdrom or floppy
|
|
|
9119d9 |
(the device attribute), it is possible to define
|
|
|
9119d9 |
@@ -2268,56 +2327,6 @@
|
|
|
9119d9 |
characters.
|
|
|
9119d9 |
Since 1.0.1
|
|
|
9119d9 |
|
|
|
9119d9 |
- host
|
|
|
9119d9 |
- The host element supports 4 attributes, viz. "name",
|
|
|
9119d9 |
- "port", "transport" and "socket", which specify the hostname, the port
|
|
|
9119d9 |
- number, transport type and path to socket, respectively. The meaning
|
|
|
9119d9 |
- of this element and the number of the elements depend on the protocol
|
|
|
9119d9 |
- attribute.
|
|
|
9119d9 |
-
|
|
|
9119d9 |
-
|
|
|
9119d9 |
- Protocol
|
|
|
9119d9 |
- Meaning
|
|
|
9119d9 |
- Number of hosts
|
|
|
9119d9 |
- Default port
|
|
|
9119d9 |
-
|
|
|
9119d9 |
-
|
|
|
9119d9 |
- nbd
|
|
|
9119d9 |
- a server running nbd-server
|
|
|
9119d9 |
- only one
|
|
|
9119d9 |
- 10809
|
|
|
9119d9 |
-
|
|
|
9119d9 |
-
|
|
|
9119d9 |
- iscsi
|
|
|
9119d9 |
- an iSCSI server
|
|
|
9119d9 |
- only one
|
|
|
9119d9 |
- 3260
|
|
|
9119d9 |
-
|
|
|
9119d9 |
-
|
|
|
9119d9 |
- rbd
|
|
|
9119d9 |
- monitor servers of RBD
|
|
|
9119d9 |
- one or more
|
|
|
9119d9 |
- 6789
|
|
|
9119d9 |
-
|
|
|
9119d9 |
-
|
|
|
9119d9 |
- sheepdog
|
|
|
9119d9 |
- one of the sheepdog servers (default is localhost:7000)
|
|
|
9119d9 |
- zero or one
|
|
|
9119d9 |
- 7000
|
|
|
9119d9 |
-
|
|
|
9119d9 |
-
|
|
|
9119d9 |
- gluster
|
|
|
9119d9 |
- a server running glusterd daemon
|
|
|
9119d9 |
- only one
|
|
|
9119d9 |
- 24007
|
|
|
9119d9 |
-
|
|
|
9119d9 |
-
|
|
|
9119d9 |
- gluster supports "tcp", "rdma", "unix" as valid values for the
|
|
|
9119d9 |
- transport attribute. nbd supports "tcp" and "unix". Others only
|
|
|
9119d9 |
- support "tcp". If nothing is specified, "tcp" is assumed. If the
|
|
|
9119d9 |
- transport is "unix", the socket attribute specifies the path to an
|
|
|
9119d9 |
- AF_UNIX socket.
|
|
|
9119d9 |
-
|
|
|
9119d9 |
address
|
|
|
9119d9 |
If present, the address element ties the disk
|
|
|
9119d9 |
to a given slot of a controller (the
|
|
|
9119d9 |
--
|
|
|
9119d9 |
2.1.3
|
|
|
9119d9 |
|