From 69affe73499139ab70c2434b57e264defd0a274a Mon Sep 17 00:00:00 2001
From: Manuel Franceschini <livewire@google.com>
Date: Mon, 9 Aug 2010 18:09:07 +0200
Subject: [PATCH] Document primary ip version and ndisc6

Signed-off-by: Manuel Franceschini <livewire@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---
 INSTALL              | 7 ++++---
 man/gnt-cluster.sgml | 9 +++++++++
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/INSTALL b/INSTALL
index dac5ab506..5729386c1 100644
--- a/INSTALL
+++ b/INSTALL
@@ -24,6 +24,7 @@ Before installing, please verify that you have the following programs:
 - `bridge utilities <http://www.linuxfoundation.org/en/Net:Bridge>`_
 - `iproute2 <http://www.linuxfoundation.org/en/Net:Iproute2>`_
 - `arping <http://www.skbuff.net/iputils/>`_ (part of iputils)
+- `ndisc6 <http://www.remlab.net/ndisc6/>`_ (if using IPv6)
 - `Python <http://www.python.org/>`_, version 2.4 or above, not 3.0
 - `Python OpenSSL bindings <http://pyopenssl.sourceforge.net/>`_
 - `simplejson Python module <http://code.google.com/p/simplejson/>`_
@@ -44,9 +45,9 @@ Debian/Ubuntu, you can use this command line to install all required
 packages, except for DRBD and Xen::
 
   $ apt-get install lvm2 ssh bridge-utils iproute iputils-arping \
-                    python python-pyopenssl openssl python-pyparsing \
-                    python-simplejson python-pyinotify python-pycurl \
-                    socat
+                    ndisc6 python python-pyopenssl openssl \
+                    python-pyparsing python-simplejson \
+                    python-pyinotify python-pycurl socat
 
 If you want to build from source, please see doc/devnotes.rst for more
 dependencies.
diff --git a/man/gnt-cluster.sgml b/man/gnt-cluster.sgml
index b4ad6d8cd..acf7de857 100644
--- a/man/gnt-cluster.sgml
+++ b/man/gnt-cluster.sgml
@@ -256,6 +256,8 @@
         <sbr>
         <arg>-I <replaceable>default instance allocator</replaceable></arg>
         <sbr>
+        <arg>--primary-ip-version <replaceable>version</replaceable></arg>
+        <sbr>
         <arg choice="req"><replaceable>clustername</replaceable></arg>
       </cmdsynopsis>
 
@@ -551,6 +553,13 @@
         <command>modify</command> command.
       </para>
 
+      <para>
+        The <option>--primary-ip-version</option> option specifies the
+        IP version used for the primary address. Possible values are 4 and
+        6 for IPv4 and IPv6, respectively. This option is used when resolving
+        node names and the cluster name.
+      </para>
+
     </refsect2>
 
     <refsect2>
-- 
GitLab