From 1b22ed456df76b5989a76251ee492e6581a84cc4 Mon Sep 17 00:00:00 2001
From: Bob Callaway <bob.callaway@netapp.com>
Date: Tue, 25 Feb 2014 08:55:01 -0500
Subject: [PATCH] Add docs on pNFS support in Cinder NFS drivers

This change adds the documentation for the changes made in Brick to
use NFS v4.1 and parallel NFS (pNFS), that will be used by Cinder
when mounting NFS shares using the base NFS driver (or potentially
other drivers that are derived from the base driver).

Change-Id: I4932c0f43714288ebbb43911258d2c0a4c41972c
Implements: blueprint pnfs
---
 .../drivers/nfs-volume-driver.xml              | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/doc/config-reference/block-storage/drivers/nfs-volume-driver.xml b/doc/config-reference/block-storage/drivers/nfs-volume-driver.xml
index cff4a17d04..fa065109c2 100644
--- a/doc/config-reference/block-storage/drivers/nfs-volume-driver.xml
+++ b/doc/config-reference/block-storage/drivers/nfs-volume-driver.xml
@@ -32,6 +32,24 @@
             the NFS driver.</para>
         <xi:include
             href="../../../common/tables/cinder-storage_nfs.xml"/>
+        <note>
+            <para>As of the Icehouse release, the NFS driver (and other
+                drivers based off it) will attempt to mount shares
+                using version 4.1 of the NFS protocol (including pNFS). If the
+                mount attempt is unsuccessful due to a lack of client or
+                server support, a subsequent mount attempt that requests the
+                default behavior of the <command>mount.nfs</command> command
+                will be performed. On most distributions, the default behavior
+                is to attempt mounting first with NFS v4.0, then silently fall
+                back to NFS v3.0 if necessary. If the
+                <option>nfs_mount_options</option> configuration option
+                contains a request for a specific version of NFS to be used,
+                or if specific options are specified in the shares
+                configuration file specified by the
+                <option>nfs_shares_config</option> configuration option, the
+                mount will be attempted as requested with no subsequent
+                attempts.</para>
+        </note>
     </section>
     <section xml:id="nfs-driver-howto">
         <title>How to use the NFS driver</title>