Clarify a bit the noded man page

[ganeti-local] / man / gnt-instance.rst

diff --git a/man/gnt-instance.rst b/man/gnt-instance.rst
index b135736..f4dc84e 100644 (file)
--- a/man/gnt-instance.rst
+++ b/man/gnt-instance.rst
@@ -334,6 +334,10 @@ root\_path
     needed for Xen PVM, while for KVM it is only used if the
     ``kernel_path`` option is also specified.
 
+    Please note, that if this setting is an empty string and the
+    hypervisor is Xen it will not be written to the Xen configuration
+    file
+
 serial\_console
     Valid for the KVM hypervisor.
 
@@ -985,7 +989,7 @@ STARTUP
 
 | **startup**
 | [--force] [--ignore-offline]
-| [--force-multiple]
+| [--force-multiple] [--no-remember]
 | [--instance \| --node \| --primary \| --secondary \| --all \|
 | --tags \| --node-tags \| --pri-node-tags \| --sec-node-tags]
 | [{-H|--hypervisor-parameters} ``key=value...``]
@@ -1043,6 +1047,12 @@ mark the instance as started even if the primary is not available.
 The ``--force-multiple`` will skip the interactive confirmation in the
 case the more than one instance will be affected.
 
+The ``--no-remember`` option will perform the startup but not change
+the state of the instance in the configuration file (if it was stopped
+before, Ganeti will still thinks it needs to be stopped). This can be
+used for testing, or for a one shot-start where you don't want the
+watcher to restart the instance if it crashes.
+
 The ``-H (--hypervisor-parameters)`` and ``-B (--backend-parameters)``
 options specify temporary hypervisor and backend parameters that can
 be used to start an instance with modified parameters. They can be
@@ -1075,7 +1085,7 @@ SHUTDOWN
 
 | **shutdown**
 | [--timeout=*N*]
-| [--force-multiple] [--ignore-offline]
+| [--force-multiple] [--ignore-offline] [--no-remember]
 | [--instance \| --node \| --primary \| --secondary \| --all \|
 | --tags \| --node-tags \| --pri-node-tags \| --sec-node-tags]
 | [--submit]
@@ -1104,6 +1114,15 @@ can be examined via **gnt-job info**.
 force the instance to be marked as stopped. This option should be used
 with care as it can lead to an inconsistent cluster state.
 
+The ``--no-remember`` option will perform the shutdown but not change
+the state of the instance in the configuration file (if it was running
+before, Ganeti will still thinks it needs to be running). This can be
+useful for a cluster-wide shutdown, where some instances are marked as
+up and some as down, and you don't want to change the running state:
+you just need to disable the watcher, shutdown all instances with
+``--no-remember``, and when the watcher is activated again it will
+restore the correct runtime state for all instances.
+
 Example::
 
     # gnt-instance shutdown instance1.example.com
@@ -1452,7 +1471,8 @@ Example (and expected output)::
 MOVE
 ^^^^
 
-**move** [-f] [-n *node*] [--shutdown-timeout=*N*] [--submit]
+**move** [-f] [--ignore-consistency]
+[-n *node*] [--shutdown-timeout=*N*] [--submit]
 {*instance*}
 
 Move will move the instance to an arbitrary node in the cluster.  This
@@ -1467,6 +1487,10 @@ before forcing the shutdown (e.g. ``xm destroy`` in XEN, killing the
 kvm process for KVM, etc.). By default two minutes are given to each
 instance to stop.
 
+The ``--ignore-consistency`` option will make Ganeti ignore any errors
+in trying to shutdown the instance on its node; useful if the
+hypervisor is broken and you want to recuperate the data.
+
 The ``--submit`` option is used to send the job to the master daemon
 but not wait for its completion. The job ID will be shown so that it
 can be examined via **gnt-job info**.