CLI: Prevent incompatible options to be selected

[ganeti-local] / README

diff --git a/README b/README
index ea01561..dfda0de 100644 (file)
--- a/README
+++ b/README
@@ -37,18 +37,6 @@ becomes better. We stop when no further move can improve the score.
 
 For algorithm details and usage, see the man page hbal(1).
 
-Cluster N+1 solver
-~~~~~~~~~~~~~~~~~~
-
-This program runs a very simple brute force algorithm over the instance
-placement space in order to determine the shortest number of replace-disks
-needed to fix the cluster. Note this means we won't get a balanced cluster,
-just one that passes N+1 checks.
-
-For algorithm details and usage, see the man page hn1(1).
-
-.. note:: This program is deprecated, hbal should be used instead.
-
 IAllocator plugin
 ~~~~~~~~~~~~~~~~~
 
@@ -72,21 +60,24 @@ checks). For more details, see the man page hspace(1).
 Integration with Ganeti
 -----------------------
 
-The ``hbal``, ``hspace`` and ``hn1`` programs can either get their
-input from text files, or online from a cluster via RAPI. For online
-collection via RAPI, the "-m" argument to both hn1 and hbal should
-specify the cluster or master node name. ``hail`` uses the standard
-iallocator API and thus doesn't need any special setup (just needs to
-be installed in the right directory).
+The ``hbal`` and ``hspace`` programs can either get their input from
+text files, locally from the master daemon (when run on the master
+node of a cluster), or remote from a cluster via RAPI. The "-L"
+argument enables local collection (with an optional path to the unix
+socket). For online collection via RAPI, the "-m" argument should
+specify the cluster or master node name. Only ``hbal`` and ``hspace``
+use these arguments, ``hail`` uses the standard iallocator API and
+thus doesn't need any special setup (just needs to be installed in the
+right directory).
 
 For generating the text files, a separate tool (``hscan``) is provided
 to automate their gathering if RAPI is available, which is better
 since it can extract more precise information. In case RAPI is not
 usable for whatever reason, the following two commands should be run::
 
-    gnt-node list -oname,mtotal,mnode,mfree,dtotal,dfree,offline \
+    gnt-node list -oname,mtotal,mnode,mfree,dtotal,dfree,ctotal,offline \
       --separator '|' --no-headers > nodes
-    gnt-instance list -oname,be/memory,sda_size,status,pnode,snodes \
+    gnt-instance list -oname,be/memory,sda_size,be/vcpus,status,pnode,snodes \
       --separator '|' --no-head > instances
 
 These two files should be saved under the names of *nodes* and