From 9c242616af4508bf68ed4c524e376f2d2579f242 Mon Sep 17 00:00:00 2001
From: Joseph Robinson <joseph.robinson@rackspace.com>
Date: Wed, 24 Dec 2014 13:46:41 +1000
Subject: [PATCH] NetApp 7mode NFS driver now uses netapp_vfiler

An update to the Configuration Reference netapp 7mode nfs table as
the NetApp 7mode 7mode NFS driver now uses the
netapp_vfiler option after a patch to fix the driver: http://review.openstack.org/139093

Change-Id: I2c450f179d7a14f9f986b02cba130d436e9755f8
backport:juno
Closes-Bug: #1403847
---
 doc/common/tables/cinder-netapp_7mode_nfs.xml              | 4 ++++
 tools/autogenerate-config-flagmappings/cinder.flagmappings | 1 +
 2 files changed, 5 insertions(+)

diff --git a/doc/common/tables/cinder-netapp_7mode_nfs.xml b/doc/common/tables/cinder-netapp_7mode_nfs.xml
index ba2847b0c1..d839ae111b 100644
--- a/doc/common/tables/cinder-netapp_7mode_nfs.xml
+++ b/doc/common/tables/cinder-netapp_7mode_nfs.xml
@@ -53,6 +53,10 @@
         <td><option>netapp_transport_type</option> = <replaceable>http</replaceable></td>
         <td>(StrOpt) The transport protocol used when communicating with the storage system or proxy server. Valid values are http or https.</td>
       </tr>
+      <tr>
+        <td><option>netapp_vfiler</option> = <replaceable>None</replaceable></td>
+        <td>(StrOpt) The vFiler unit on which provisioning of block storage volumes will be done. This option is only used by the driver when connecting to an instance with a storage family of Data ONTAP operating in 7-Mode and the storage protocol selected is NFS. Only use this option when utilizing the MultiStore feature on the NetApp storage system.</td>
+      </tr>
       <tr>
         <td><option>thres_avl_size_perc_start</option> = <replaceable>20</replaceable></td>
         <td>(IntOpt) If the percentage of available space for an NFS share has dropped below the value specified by this option, the NFS image cache will be cleaned.</td>
diff --git a/tools/autogenerate-config-flagmappings/cinder.flagmappings b/tools/autogenerate-config-flagmappings/cinder.flagmappings
index a20e73a5be..0f28a2b497 100644
--- a/tools/autogenerate-config-flagmappings/cinder.flagmappings
+++ b/tools/autogenerate-config-flagmappings/cinder.flagmappings
@@ -235,6 +235,7 @@ netapp_storage_pools netapp_eseries_iscsi
 netapp_storage_protocol netapp_7mode_iscsi netapp_7mode_nfs netapp_cdot_iscsi netapp_cdot_nfs
 netapp_transport_type netapp_7mode_iscsi netapp_7mode_nfs netapp_cdot_iscsi netapp_cdot_nfs netapp_eseries_iscsi
 netapp_vfiler netapp_7mode_iscsi
+netapp_vfiler netapp_7mode_nfs
 netapp_volume_list netapp_7mode_iscsi
 netapp_vserver netapp_cdot_iscsi netapp_cdot_nfs
 netapp_webservice_path netapp_eseries_iscsi