QA: adapt changes wrt DRBD usermode helper

[ganeti-local] / man / gnt-cluster.rst

diff --git a/man/gnt-cluster.rst b/man/gnt-cluster.rst
index 5a3798f..3b0ee1c 100644 (file)
--- a/man/gnt-cluster.rst
+++ b/man/gnt-cluster.rst
@@ -173,6 +173,7 @@ INIT
 | [\--no-etc-hosts]
 | [\--no-ssh-init]
 | [\--file-storage-dir *dir*]
+| [\--shared-file-storage-dir *dir*]
 | [\--enabled-hypervisors *hypervisors*]
 | [{-H|\--hypervisor-parameters} *hypervisor*:*hv-param*=*value*[,*hv-param*=*value*...]]
 | [{-B|\--backend-parameters} *be-param*=*value*[,*be-param*=*value*...]]
@@ -235,7 +236,7 @@ the cluster creation and DRBD support is enabled you might have to
 manually modify the metavg as well.
 
 If you don't want to use lvm storage at all use
-the ``--enabled-disk-template`` option to restrict the set of enabled
+the ``--enabled-disk-templates`` option to restrict the set of enabled
 disk templates. Once the cluster is initialized
 you can change this setup with the **modify** command.
 
@@ -266,9 +267,14 @@ without modifying the /etc/hosts file.
 The ``--no-ssh-init`` option allows you to initialize the cluster
 without creating or distributing SSH key pairs.
 
-The ``--file-storage-dir`` option allows you set the directory to
-use for storing the instance disk files when using file storage as
-backend for instance disks.
+The ``--file-storage-dir`` and ``--shared-file-storage-dir`` options
+allow you set the directory to use for storing the instance disk files
+when using file storage backend, respectively shared file storage
+backend,  for instance disks. Note that the file and shared file storage
+dir must be an allowed directory for file storage. Those directories
+are specified in the ``@SYSCONFDIR@/ganeti/file-storage-paths`` file.
+The file storage directory can also be a subdirectory of an allowed one.
+The file storage directory should be present on all nodes.
 
 The ``--prealloc-wipe-disks`` sets a cluster wide configuration value
 for wiping disks prior to allocation and size changes (``gnt-instance
@@ -533,11 +539,12 @@ Please note, that ``std`` values are not the same as defaults set by
 - ``--specs-mem-size`` limits the amount of memory available
 - ``--specs-nic-count`` sets limits on the number of NICs used
 
-The ``--ipolicy-disk-templates`` and ``--ipolicy-spindle-ratio`` options
-take a decimal number. The ``--ipolicy-disk-templates`` option takes a
-comma-separated list of disk templates.
+The ``--ipolicy-spindle-ratio`` option takes a decimal number. The
+``--ipolicy-disk-templates`` option takes a comma-separated list of disk
+templates. This list of disk templates must be a subset of the list
+of cluster-wide enabled disk templates (which can be set with
+``--enabled-disk-templates``).
 
-- ``--ipolicy-disk-templates`` limits the allowed disk templates
 - ``--ipolicy-spindle-ratio`` limits the instances-spindles ratio
 - ``--ipolicy-vcpu-ratio`` limits the vcpu-cpu ratio
 
@@ -557,7 +564,9 @@ this list, see **gnt-instance**\(8). Note that in contrast to the list of
 disk templates in the ipolicy, this list is a hard restriction. It is not
 possible to create instances with disk templates that are not enabled in
 the cluster. It is also not possible to disable a disk template when there
-are still instances using it.
+are still instances using it. The first disk template in the list of
+enabled disk template is the default disk template. It will be used for
+instance creation, if no disk template is requested explicitely.
 
 MASTER-FAILOVER
 ~~~~~~~~~~~~~~~
@@ -626,6 +635,8 @@ MODIFY
 | [\--ipolicy-vcpu-ratio *ratio*]
 | [\--enabled-disk-templates *template* [,*template*...]]
 | [\--drbd-usermode-helper *helper*]
+| [\--file-storage-dir *dir*]
+| [\--shared-file-storage-dir *dir*]
 
 
 Modify the options for the cluster.
@@ -635,7 +646,8 @@ The ``--vg-name``, ``--enabled-hypervisors``, ``-H (--hypervisor-parameters)``,
 ``-C (--candidate-pool-size)``, ``--maintain-node-health``,
 ``--prealloc-wipe-disks``, ``--uid-pool``, ``--node-parameters``,
 ``--master-netdev``, ``--master-netmask``, ``--use-external-mip-script``,
-``--drbd-usermode-helper``, and ``--enabled-disk-templates`` options are
+``--drbd-usermode-helper``, ``--file-storage-dir``,
+``--shared-file-storage-dir``, and ``--enabled-disk-templates`` options are
 described in the **init** command.
 
 The ``--hypervisor-state`` and ``--disk-state`` options are described in