Update documentation of watcher and RAPI daemon

.. to reflect the relationship between the RAPI daemons'
-b option and the watchers --rapi-ip option.

Signed-off-by: Helga Velroyen <helgav@google.com>
Reviewed-by: Petr Pudlak <pudlak@google.com>

diff --git a/man/ganeti-rapi.rst b/man/ganeti-rapi.rst
index da515cf..3cded7b 100644 (file)
--- a/man/ganeti-rapi.rst
+++ b/man/ganeti-rapi.rst
@@ -9,7 +9,7 @@ ganeti-rapi - Ganeti remote API daemon
 Synopsis
 --------
 
-| **ganeti-rapi** [-d] [-f] [-p *PORT] [-b *ADDRESS*] [-i *INTERFACE*]
+| **ganeti-rapi** [-d] [-f] [-p *PORT*] [-b *ADDRESS*] [-i *INTERFACE*]
 | [\--no-ssl] [-K *SSL_KEY_FILE*] [-C *SSL_CERT_FILE*]
 | [\--require-authentication]
 
@@ -28,8 +28,11 @@ The daemon will listen to the "ganeti-rapi" TCP port, as listed in the
 system services database, or if not defined, to port 5080 by default.
 The port can be overridded by passing the ``-p`` option. The ``-b``
 option can be used to specify the address to bind to (defaults to
-``0.0.0.0``); alternatively, the ``-i`` option can be used to specify
-the interface to bind do.
+``0.0.0.0``). Note that if you specify the address, the watcher
+needs to be informed about it using its option ``--rapi-ip``, otherwise
+it will not be able to reach the RAPI interface and will attempt to
+restart it all the time. Alternatively to setting the IP with ``--b``,
+the ``-i`` option can be used to specify the interface to bind do.
 
 See the *Ganeti remote API* documentation for further information.
 

diff --git a/man/ganeti-watcher.rst b/man/ganeti-watcher.rst
index 69925d7..ae4cb8d 100644 (file)
--- a/man/ganeti-watcher.rst
+++ b/man/ganeti-watcher.rst
@@ -9,9 +9,8 @@ ganeti-watcher - Ganeti cluster watcher
 Synopsis
 --------
 
-**ganeti-watcher** [``--debug``]
-[``--job-age=``*age*]
-[``--ignore-pause``]
+**ganeti-watcher** [\--debug] [\--job-age=*age* ] [\--ignore-pause]
+[\--rapi-ip=*IP*]
 
 DESCRIPTION
 -----------
@@ -31,6 +30,11 @@ wants to run it just once.
 The ``--debug`` option will increase the verbosity of the watcher
 and also activate logging to the standard error.
 
+The ``--rapi-ip`` option needs to be set if the RAPI daemon was
+started with a particular IP (using the ``-b`` option). The two
+options need to be exactly the same to ensure that the watcher
+can reach the RAPI interface.
+
 Master operations
 ~~~~~~~~~~~~~~~~~