From a1cef5527ea48393bf421e17b7b5d2ae6f281408 Mon Sep 17 00:00:00 2001
From: Iustin Pop <iustin@google.com>
Date: Tue, 29 May 2012 14:08:14 +0200
Subject: [PATCH] Document that the disk/hypervisor state is not used
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This didn't get completed in time for 2.6, so we document that it's
not working as is. Well, it's not broken, just not used by anything.
Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: RenΓ© Nussbaumer <rn@google.com>
---
lib/cli.py | 9 ++++++---
man/ganeti.rst | 6 ++++++
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/lib/cli.py b/lib/cli.py
index 6bff11523..feb0fe41a 100644
--- a/lib/cli.py
+++ b/lib/cli.py
@@ -1404,14 +1404,17 @@ IGNORE_ERRORS_OPT = cli_option("-I", "--ignore-errors", default=[],
DISK_STATE_OPT = cli_option("--disk-state", default=[], dest="disk_state",
action="append",
- help=("Specify disk state information in the format"
- " storage_type/identifier:option=value,..."),
+ help=("Specify disk state information in the"
+ " format"
+ " storage_type/identifier:option=value,...;"
+ " note this is unused for now"),
type="identkeyval")
HV_STATE_OPT = cli_option("--hypervisor-state", default=[], dest="hv_state",
action="append",
help=("Specify hypervisor state information in the"
- " format hypervisor:option=value,..."),
+ " format hypervisor:option=value,...;"
+ " note this is unused for now"),
type="identkeyval")
IGNORE_IPOLICY_OPT = cli_option("--ignore-ipolicy", dest="ignore_ipolicy",
diff --git a/man/ganeti.rst b/man/ganeti.rst
index c7137c0ab..2d5c82f72 100644
--- a/man/ganeti.rst
+++ b/man/ganeti.rst
@@ -144,6 +144,9 @@ cpu_node
discovered or set manually. Only used for estimating how many VCPUs
are left for instances
+Note that currently this option is unused by Ganeti; values will be
+recorded but will not influence the Ganeti operation.
+
Disk State Parameters
~~~~~~~~~~~~~~~~~~~~~
@@ -166,6 +169,9 @@ disk_overhead
Disk that is expected to be used by other volumes (set via
``reserved_lvs``); usually should be zero
+Note that currently this option is unused by Ganeti; values will be
+recorded but will not influence the Ganeti operation.
+
Cluster configuration
~~~~~~~~~~~~~~~~~~~~~
--
GitLab