From 5914192ce6b554383be4078f8b3a31c39543cc12 Mon Sep 17 00:00:00 2001
From: Helga Velroyen <helgav@google.com>
Date: Thu, 28 Mar 2013 13:45:32 +0100
Subject: [PATCH] Update man page 'gnt-cluster' regarding disk templates
This documents the new 'gnt-cluster init/modify' option
'--enabled-disk-templates' in the man page.
Signed-off-by: Helga Velroyen <helgav@google.com>
Reviewed-by: Michele Tartara <mtarara@google.com>
---
man/gnt-cluster.rst | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/man/gnt-cluster.rst b/man/gnt-cluster.rst
index bcba7ef49..52c2c3f0f 100644
--- a/man/gnt-cluster.rst
+++ b/man/gnt-cluster.rst
@@ -186,6 +186,7 @@ INIT
| [\--ipolicy-disk-templates *template* [,*template*...]]
| [\--disk-state *diskstate*]
| [\--hypervisor-state *hvstate*]
+| [\--enabled-disk-templates *template* [,*template*...]]
| {*clustername*}
This commands is only run once initially on the first node of the
@@ -508,6 +509,14 @@ comma-separated list of disk templates.
For details about how to use ``--hypervisor-state`` and ``--disk-state``
have a look at **ganeti**\(7).
+The ``--enabled-disk-templates`` option specifies a list of disk templates
+that can be used by instances of the cluster. For the possible values in
+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.
+
MASTER-FAILOVER
~~~~~~~~~~~~~~~
@@ -574,6 +583,7 @@ MODIFY
| [\--specs-mem-size *spec-param*=*value* [,*spec-param*=*value*...]]
| [\--specs-nic-count *spec-param*=*value* [,*spec-param*=*value*...]]
| [\--ipolicy-disk-templates *template* [,*template*...]]
+| [\--enabled-disk-templates *template* [,*template*...]]
Modify the options for the cluster.
@@ -583,8 +593,8 @@ The ``--vg-name``, ``--no-lvm-storage``, ``--enabled-hypervisors``,
``-D (--disk-parameters)``, ``--nic-parameters``, ``-C
(--candidate-pool-size)``, ``--maintain-node-health``,
``--prealloc-wipe-disks``, ``--uid-pool``, ``--node-parameters``,
-``--master-netdev``, ``--master-netmask`` and
-``--use-external-mip-script`` options are described in the **init**
+``--master-netdev``, ``--master-netmask``, ``--use-external-mip-script``,
+and ``--enabled-disk-templates`` options are described in the **init**
command.
The ``--hypervisor-state`` and ``--disk-state`` options are described in
--
GitLab