Remove old "reason" implementation

[ganeti-local] / doc / design-resource-model.rst

diff --git a/doc/design-resource-model.rst b/doc/design-resource-model.rst
index 543da3c..a4d63c6 100644 (file)
--- a/doc/design-resource-model.rst
+++ b/doc/design-resource-model.rst
@@ -609,10 +609,10 @@ parameters:
   request
 
 Ganeti will by default reject non-standard instance sizes (lower than
-``min_ispec`` or greater than ``max_ispec``), but as usual a ``--force``
-option on the command line or in the RAPI request will override these
-constraints. The ``std_spec`` structure will be used to fill in missing
-instance specifications on create.
+``min_ispec`` or greater than ``max_ispec``), but as usual a
+``--ignore-ipolicy`` option on the command line or in the RAPI request
+will override these constraints. The ``std_spec`` structure will be used
+to fill in missing instance specifications on create.
 
 Each of the ispec structures will be a dictionary, since the contents
 can change over time. Initially, we will define the following variables
@@ -621,9 +621,7 @@ in these structures:
 +---------------+----------------------------------+--------------+
 |Name           |Description                       |Type          |
 +===============+==================================+==============+
-|mem_min        |Minimum memory size allowed       |int           |
-+---------------+----------------------------------+--------------+
-|mem_max        |Maximum allowed memory size       |int           |
+|mem_size       |Allowed memory size               |int           |
 +---------------+----------------------------------+--------------+
 |cpu_count      |Allowed vCPU count                |int           |
 +---------------+----------------------------------+--------------+
@@ -741,6 +739,17 @@ brackets.
 |        |              |for drbd, when using the |constants.py, not    |      |
 |        |              |static syncer, in KiB/s  |changeable via Ganeti|      |
 +--------+--------------+-------------------------+---------------------+------+
+|drbd    |dynamic-resync|Whether to use the       |Not supported.       |bool  |
+|        |              |dynamic resync speed     |                     |      |
+|        |              |controller or not. If    |                     |      |
+|        |              |enabled, c-plan-ahead    |                     |      |
+|        |              |must be non-zero and all |                     |      |
+|        |              |the c-* parameters will  |                     |      |
+|        |              |be used by DRBD.         |                     |      |
+|        |              |Otherwise, the value of  |                     |      |
+|        |              |resync-rate will be used |                     |      |
+|        |              |as a static resync speed.|                     |      |
++--------+--------------+-------------------------+---------------------+------+
 |drbd    |c-plan-ahead  |Agility factor of the    |Not supported.       |int   |
 |        |              |dynamic resync speed     |                     |      |
 |        |              |controller. (the higher, |                     |      |