diff --git a/docs/schemas/storagepool.rng b/docs/schemas/storagepool.rng index 66d3c22169..61fa7a3eb3 100644 --- a/docs/schemas/storagepool.rng +++ b/docs/schemas/storagepool.rng @@ -381,11 +381,10 @@ auto nfs + cifs + glusterfs - - - diff --git a/docs/storage.html.in b/docs/storage.html.in index 118144477c..0464565adb 100644 --- a/docs/storage.html.in +++ b/docs/storage.html.in @@ -249,7 +249,8 @@ a local block device as the source, it requires the name of a host and path of an exported directory. It will mount this network filesystem and manage files within the directory of its mount - point. It will default to using NFS as the protocol. + point. It will default to using auto as the + protocol, which generally tries a mount via NFS first.

Example pool input

@@ -259,6 +260,7 @@ <source> <host name="nfs.example.com"/> <dir path="/var/lib/virt/images"/> + <format type='nfs'/> </source> <target> <path>/var/lib/virt/images</path> @@ -275,10 +277,13 @@ nfs
  • - glusterfs + glusterfs - use the glusterfs FUSE file system. + For now, the dir specified as the source can only + be a gluster volume name, as gluster does not provide a way to + directly mount subdirectories within a volume.
  • - cifs + cifs - use the SMB (samba) or CIFS file system
  • diff --git a/tests/storagepoolxml2xmlin/pool-netfs-gluster.xml b/tests/storagepoolxml2xmlin/pool-netfs-gluster.xml new file mode 100644 index 0000000000..9b39e870ff --- /dev/null +++ b/tests/storagepoolxml2xmlin/pool-netfs-gluster.xml @@ -0,0 +1,12 @@ + + + + + + + netfs-gluster + d5609ced-94b1-489e-b218-eff35c30336a + + /mnt/gluster + + diff --git a/tests/storagepoolxml2xmlout/pool-netfs-gluster.xml b/tests/storagepoolxml2xmlout/pool-netfs-gluster.xml new file mode 100644 index 0000000000..bab2a15fb2 --- /dev/null +++ b/tests/storagepoolxml2xmlout/pool-netfs-gluster.xml @@ -0,0 +1,20 @@ + + netfs-gluster + d5609ced-94b1-489e-b218-eff35c30336a + 0 + 0 + 0 + + + + + + + /mnt/gluster + + 0755 + -1 + -1 + + + diff --git a/tests/storagepoolxml2xmltest.c b/tests/storagepoolxml2xmltest.c index 0ae9b298f1..743e1cb86d 100644 --- a/tests/storagepoolxml2xmltest.c +++ b/tests/storagepoolxml2xmltest.c @@ -93,6 +93,7 @@ mymain(void) DO_TEST("pool-iscsi"); DO_TEST("pool-iscsi-auth"); DO_TEST("pool-netfs"); + DO_TEST("pool-netfs-gluster"); DO_TEST("pool-scsi"); DO_TEST("pool-scsi-type-scsi-host"); DO_TEST("pool-scsi-type-fc-host");