Merge branch 'stable-2.8' into master

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

diff --git a/man/gnt-cluster.rst b/man/gnt-cluster.rst
index 5583e66..4458e2b 100644 (file)
--- a/man/gnt-cluster.rst
+++ b/man/gnt-cluster.rst
@@ -170,7 +170,6 @@ INIT
 | [\--master-netmask *netmask*]
 | [\--use-external-mip-script {yes \| no}]
 | [{-m|\--mac-prefix} *mac-prefix*]
-| [\--no-lvm-storage]
 | [\--no-etc-hosts]
 | [\--no-ssh-init]
 | [\--file-storage-dir *dir*]
@@ -198,6 +197,7 @@ INIT
 | [\--ipolicy-vcpu-ratio *ratio*]
 | [\--disk-state *diskstate*]
 | [\--hypervisor-state *hvstate*]
+| [\--drbd-usermode-helper *helper*]
 | [\--enabled-disk-templates *template* [,*template*...]]
 | {*clustername*}
 
@@ -235,7 +235,8 @@ 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 ``--no-lvm-storage`` option. Once the cluster is initialized
+the ``--enabled-disk-template`` option to restrict the set of enabled
+disk templates. Once the cluster is initialized
 you can change this setup with the **modify** command.
 
 The ``--master-netdev`` option is useful for specifying a different
@@ -259,12 +260,6 @@ prefix under which the virtual MAC addresses of your instances will be
 generated. The prefix must be specified in the format ``XX:XX:XX`` and
 the default is ``aa:00:00``.
 
-The ``--no-lvm-storage`` option allows you to initialize the
-cluster without lvm support. This means that only instances using
-files as storage backend will be possible to create. Once the
-cluster is initialized you can change this setup with the
-**modify** command.
-
 The ``--no-etc-hosts`` option allows you to initialize the cluster
 without modifying the /etc/hosts file.
 
@@ -545,6 +540,9 @@ All the instance policy elements can be overridden at group level. Group
 level overrides can be removed by specifying ``default`` as the value of
 an item.
 
+The ``--drbd-usermode-helper`` option can be used to specify a usermode
+helper. Check that this string is the one used by the DRBD kernel.
+
 For details about how to use ``--hypervisor-state`` and ``--disk-state``
 have a look at **ganeti**\(7).
 
@@ -596,7 +594,6 @@ MODIFY
 
 | **modify** [\--submit]
 | [\--vg-name *vg-name*]
-| [\--no-lvm-storage]
 | [\--enabled-hypervisors *hypervisors*]
 | [{-H|\--hypervisor-parameters} *hypervisor*:*hv-param*=*value*[,*hv-param*=*value*...]]
 | [{-B|\--backend-parameters} *be-param*=*value*[,*be-param*=*value*...]]
@@ -622,18 +619,18 @@ MODIFY
 | [\--ipolicy-spindle-ratio *ratio*]
 | [\--ipolicy-vcpu-ratio *ratio*]
 | [\--enabled-disk-templates *template* [,*template*...]]
+| [\--drbd-usermode-helper *helper*]
 
 
 Modify the options for the cluster.
 
-The ``--vg-name``, ``--no-lvm-storage``, ``--enabled-hypervisors``,
-``-H (--hypervisor-parameters)``, ``-B (--backend-parameters)``,
-``-D (--disk-parameters)``, ``--nic-parameters``, ``-C
-(--candidate-pool-size)``, ``--maintain-node-health``,
+The ``--vg-name``, ``--enabled-hypervisors``, ``-H (--hypervisor-parameters)``,
+``-B (--backend-parameters)``, ``-D (--disk-parameters)``, ``--nic-parameters``,
+``-C (--candidate-pool-size)``, ``--maintain-node-health``,
 ``--prealloc-wipe-disks``, ``--uid-pool``, ``--node-parameters``,
 ``--master-netdev``, ``--master-netmask``, ``--use-external-mip-script``,
-and ``--enabled-disk-templates`` options are described in the **init**
-command.
+``--drbd-usermode-helper``, and ``--enabled-disk-templates`` options are
+described in the **init** command.
 
 The ``--hypervisor-state`` and ``--disk-state`` options are described in
 detail in **ganeti**\(7).