[PATCH master 5/5] hinfo: Make it possible to load an IAlloc request
René Nussbaumer
htools/Ganeti/HTools/Program/Hinfo.hs | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/htools/Ganeti/HTools/Program/Hinfo.hs b/htools/Ganeti/HTools/Program/Hinfo.hs
index 5accbdb..548443b 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
--
1.7.7.3
Iustin Pop
> ---
> htools/Ganeti/HTools/Program/Hinfo.hs | 1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/htools/Ganeti/HTools/Program/Hinfo.hs b/htools/Ganeti/HTools/Program/Hinfo.hs
> index 5accbdb..548443b 100644
> --- a/htools/Ganeti/HTools/Program/Hinfo.hs
> +++ b/htools/Ganeti/HTools/Program/Hinfo.hs
> @@ -51,6 +51,7 @@ options =
> , oDataFile
> , oRapiMaster
> , oLuxiSocket
> + , oIAllocSrc
Possibly this needs man page update too… And I think I would add it to
all binaries at the same time - it not _extremely_ useful, but it's fun.
iustin
René Nussbaumer
- hbal
- hspace
- hinfo
This change also documents the flag in all man-pages.
---
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 b784833..c6cb629 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 5accbdb..548443b 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 3b64159..9dcd3c8 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 2bf018f..2cda02f 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 ec1789a..d5109dd 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 74da340..f674c5b 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 cc9ef39..49fd08b 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: collect data directly from an iallocator
+ specification (as produced by Ganeti when doing an iallocator call).
+ The iallocator specification 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
--
1.7.7.3
Iustin Pop
LGTM on the rest, but I would kindly ask to reword this a bit. "Collect"
is not so good as it implies actively connecting to something - I would
suggest "load data directly…". And specification doesn't sound right -
can we just say request?
thanks!
iustin
René Nussbaumer
Sure! Here's the interdiff:
diff --git a/man/htools.rst b/man/htools.rst
index 49fd08b..a05039b 100644
--- a/man/htools.rst
+++ b/man/htools.rst
@@ -204,9 +204,9 @@ support all options. Some common options are:
by Ganeti (configured at build time) is used.
-I|\--ialloc-src *path*
- Backend specification: collect data directly from an iallocator
- specification (as produced by Ganeti when doing an iallocator call).
- The iallocator specification is read from specified 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
René
Iustin Pop
LGTM, thanks!
iustin
René Nussbaumer
Algorithm options:
diff --git a/man/htools.rst b/man/htools.rst
index cc9ef39..49fd08b 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: collect data directly from an iallocator
+ specification (as produced by Ganeti when doing an iallocator call).
+ The iallocator specification is read from specified path.
+
\--simulate *description*
Backend specification: instead of using actual data, build an empty
René Nussbaumer
> This is only useful in the stand-alone command line tools:
>
> - hbal
> - hspace
> - hinfo
>
> This change also documents the flag in all man-pages.
> ---
> 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(-)
Sorry, I accidentely resent this patch! You can ignore this :)
René