From 0547d608b4d5424e9192f5e2e7619393b5e2e250 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Nussbaumer?= <rn@google.com>
Date: Fri, 2 Mar 2012 13:15:13 +0100
Subject: [PATCH] htools: Make it possible to load an IAlloc request
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This is only useful in the stand-alone command line tools:
- hbal
- hspace
- hinfo
This change also documents the flag in all man-pages.
Signed-off-by: RenΓ© Nussbaumer <rn@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---
htools/Ganeti/HTools/Program/Hbal.hs | 1 +
htools/Ganeti/HTools/Program/Hinfo.hs | 1 +
htools/Ganeti/HTools/Program/Hspace.hs | 1 +
man/hbal.rst | 3 ++-
man/hinfo.rst | 3 ++-
man/hspace.rst | 2 +-
man/htools.rst | 5 +++++
7 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/htools/Ganeti/HTools/Program/Hbal.hs b/htools/Ganeti/HTools/Program/Hbal.hs
index b7848339c..c6cb62998 100644
--- a/htools/Ganeti/HTools/Program/Hbal.hs
+++ b/htools/Ganeti/HTools/Program/Hbal.hs
@@ -63,6 +63,7 @@ options =
, oEvacMode
, oRapiMaster
, oLuxiSocket
+ , oIAllocSrc
, oExecJobs
, oGroup
, oMaxSolLength
diff --git a/htools/Ganeti/HTools/Program/Hinfo.hs b/htools/Ganeti/HTools/Program/Hinfo.hs
index 5accbdb65..548443bee 100644
--- a/htools/Ganeti/HTools/Program/Hinfo.hs
+++ b/htools/Ganeti/HTools/Program/Hinfo.hs
@@ -51,6 +51,7 @@ options =
, oDataFile
, oRapiMaster
, oLuxiSocket
+ , oIAllocSrc
, oVerbose
, oQuiet
, oOfflineNode
diff --git a/htools/Ganeti/HTools/Program/Hspace.hs b/htools/Ganeti/HTools/Program/Hspace.hs
index 3b64159e7..9dcd3c8af 100644
--- a/htools/Ganeti/HTools/Program/Hspace.hs
+++ b/htools/Ganeti/HTools/Program/Hspace.hs
@@ -56,6 +56,7 @@ options =
, oNodeSim
, oRapiMaster
, oLuxiSocket
+ , oIAllocSrc
, oVerbose
, oQuiet
, oOfflineNode
diff --git a/man/hbal.rst b/man/hbal.rst
index 2bf018f10..2cda02f85 100644
--- a/man/hbal.rst
+++ b/man/hbal.rst
@@ -16,7 +16,8 @@ SYNOPSIS
Backend options:
-{ **-m** *cluster* | **-L[** *path* **] [-X]** | **-t** *data-file* }
+{ **-m** *cluster* | **-L[** *path* **] [-X]** | **-t** *data-file* |
+**-I** *path* }
Algorithm options:
diff --git a/man/hinfo.rst b/man/hinfo.rst
index ec1789aed..d5109dd8e 100644
--- a/man/hinfo.rst
+++ b/man/hinfo.rst
@@ -16,7 +16,8 @@ SYNOPSIS
Backend options:
-{ **-m** *cluster* | **-L[** *path* **] [-X]** | **-t** *data-file* }
+{ **-m** *cluster* | **-L[** *path* **] [-X]** | **-t** *data-file* |
+**-I** *path* }
Algorithm options:
diff --git a/man/hspace.rst b/man/hspace.rst
index 74da3400a..f674c5b35 100644
--- a/man/hspace.rst
+++ b/man/hspace.rst
@@ -17,7 +17,7 @@ SYNOPSIS
Backend options:
{ **-m** *cluster* | **-L[** *path* **] [-X]** | **-t** *data-file* |
-**\--simulate** *spec* }
+**\--simulate** *spec* | **-I** *path* }
Algorithm options:
diff --git a/man/htools.rst b/man/htools.rst
index cc9ef3919..a05039b10 100644
--- a/man/htools.rst
+++ b/man/htools.rst
@@ -203,6 +203,11 @@ support all options. Some common options are:
on which the master daemon listens; otherwise, the default path used
by Ganeti (configured at build time) is used.
+-I|\--ialloc-src *path*
+ Backend specification: load data directly from an iallocator request
+ (as produced by Ganeti when doing an iallocator call). The iallocator
+ request is read from specified path.
+
\--simulate *description*
Backend specification: instead of using actual data, build an empty
cluster given a node description. The *description* parameter must be
--
GitLab