Merge branch 'stable-2.12' into stable-2.13

[ganeti-github.git] / man / gnt-cluster.rst

diff --git a/man/gnt-cluster.rst b/man/gnt-cluster.rst
index a04d50c..f34677a 100644 (file)
--- a/man/gnt-cluster.rst
+++ b/man/gnt-cluster.rst
@@ -645,15 +645,22 @@ over the master role in a 2 node cluster with the original master
 down). If the original master then comes up, it won't be able to
 start its master daemon because it won't have enough votes, but so
 won't the new master, if the master daemon ever needs a restart.
-You can pass ``--no-voting`` to **ganeti-masterd** on the new
-master to solve this problem, and run **gnt-cluster redist-conf**
-to make sure the cluster is consistent again.
+You can pass ``--no-voting`` to **ganeti-luxid** and **ganeti-wconfd**
+on the new master to solve this problem, and run
+**gnt-cluster redist-conf** to make sure the cluster is consistent
+again.
 
 The option ``--yes-do-it`` is used together with ``--no-voting``, for
 skipping the interactive checks. This is even more dangerous, and should
 only be used in conjunction with other means (e.g. a HA suite) to
 confirm that the operation is indeed safe.
 
+Note that in order for remote node agreement checks to work, a strict
+majority of nodes still needs to be functional. To avoid situations with
+daemons not starting up on the new master, master-failover without
+the ``--no-voting`` option verifies a healthy majority of nodes and refuses
+the operation otherwise.
+
 MASTER-PING
 ~~~~~~~~~~~