Update and fix the documentation

- Documentation has been updated and corrected to correspond latest
 version of the code

Change-Id: I9f51cc17b72b1efa6765add17d92cfbb7126f35f

README.md

@@ -4,13 +4,13 @@ Cinder NetApp plugin for Fuel
 Overview
 --------
 
-NetApp plugin can replace the Cinder LVM backend by Cinder Netapp Backend or work in parallel when deployed with multi-backend enabled.
+The plugin can replace Cinder default backend by Cinder NetApp backend or work in parallel. ``LVM over iSCSI`` and ``Ceph`` are two choices, which can be used as a default backend for Cinder. The plugin does not overwrite ``enabled_backends`` option that allows to use it with other plugins for Cinder backends.
-LVM is the default volume backend that uses local volumes managed by LVM.
 
-The plugin support following storage family mode:
+
- - ONTAP 7-Mode
+The plugin support following storage families:
- - ONTAP Cluster Mode
+ - Clustered Data ONTAP
- - E-Series
+ - Data ONTAP 7-Mode
+ - E-Series/EF-Series
 
 This repo contains all necessary files to build Cinder NetApp Fuel plugin.
 
@@ -19,14 +19,18 @@ Requirements
 ------------
 
 | Requirement                                                                              | Version/Comment                                                        |
-|------------------------------------------------------------------------------------------|---------------------------------------------------------|
+|------------------------------------------------------------------------------------------|------------------------------------------------------------------------|
 | Mirantis Openstack compatibility                                                         | 8.0                                                                    |
-| Netapp filer or appliance is reachable via one of the Mirantis OpenStack networks        | ONTAP or E-Series storage family with NTF\iSCSI enabled |
+| Netapp filer or appliance is reachable via one of the Mirantis OpenStack networks        | Data ONTAP or E-Series/EF-Series storage family with NTS\iSCSI enabled |
 
 
 Release Notes
 -------------
 
+**4.2.1**
+
+* Documentation has been updated and fixed
+
 **4.2.0**
 
 * Added full support of multi backends
@@ -37,45 +41,45 @@ Release Notes
 
 **4.1.1**
 
-* Fix bug with multibackend when Ceph is used (bug: 1581028)
+* Fixed bug with multi backend when Ceph is used (bug: 1581028)
 
 **4.1.0**
 
-* Rewrite fields in UI
+* Rewrited fields in UI
 
 **4.0.0**
 
-* add MOS 8.0 support
+* Added MOS 8.0 support
 
 **3.2.0**
 
-* add E-Series storage family support
+* Added E-Series storage family support
 
-* fix the plugin UI
+* Fixed the plugin UI
 
 **3.1.0**
 
-* add high availability of operations with Volumes
+* Added high availability of operations with Volumes
 
 **3.0.0**
 
-* migrate the plugin from 2.0.0 to 3.0.0 package version
+* The plugin was migrated from 2.0.0 to 3.0.0 package version
 
 **2.0.0**
 
-* migrate plugins from 1.0.0 to 2.0.0 package version
+* The plugin was migrated from 1.0.0 to 2.0.0 package version
 
 **1.2.0**
 
-* add  multi backend support
+* Added multi backend support
 
-* add missing dependencies on compute node
+* Added missing dependencies on compute node
 
-* add capacity to deploy cinder role on a non controller node
+* Added capacity to deploy cinder role on a non controller node
 
 **1.1.0**
 
-* add 7 mode storage family support
+* Added 7 mode storage family support
 
 **1.0.0**
 

doc/source/appendix.rst

@@ -1,6 +1,6 @@
+========
 Appendix
 ========
+#. `Data ONTAP documentation <http://mysupport.netapp.com/documentation/productlibrary/index.html?productID=30092>`_
 
-#. `ONTAP documentation <http://mysupport.netapp.com/documentation/productlibrary/index.html?productID=30092>`_
+#. `E-Series/EF-Series documentation <https://mysupport.netapp.com/info/web/ECMP1658252.html>`_
-
-#. `E-Series documentation <https://mysupport.netapp.com/info/web/ECMP1658252.html>`_

doc/source/conf.py

@@ -54,9 +54,9 @@ author = u'Mirantis Inc.'
 # built documents.
 #
 # The short X.Y version.
-version = '4.1-4.1.1-1'
+version = '4.2-4.2.1-1'
 # The full version, including alpha/beta/rc tags.
-release = '4.1-4.1.1-1'
+release = '4.2-4.2.1-1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

doc/source/description.rst

@@ -1,11 +1,12 @@
+=============
 NetApp plugin
 =============
 
-NetApp plugin provides support of ONTAP and E-series storage clusters to Cinder.
+The plugin provides support of ``Clustered Data ONTAP``, ``Data ONTAP 7-Mode`` and ``E-series`` storage clusters to Cinder.
-NetApp plugin uses NetApp unified driver; the latter is a
+The plugin uses NetApp unified driver, the latter is a
 block storage driver that supports multiple storage families and protocols.
 A storage family corresponds to storage systems built on different NetApp technologies
-such as clustered Data ONTAP, Data ONTAP operating in 7-Mode,
+such as Clustered Data ONTAP, Data ONTAP operating in 7-Mode,
 and E-Series.
 The storage protocol refers to the protocol used to initiate data
 storage and access operations on those storage systems like iSCSI and NFS.
@@ -18,11 +19,13 @@ storage families and protocols.
 
 Features
 --------
-* ONTAP Clustered Mode as a backend for Cinder with NFS or iSCSI data-transfer protocols
+* Clustered Data ONTAP as a backend for Cinder with NFS or iSCSI data-transfer protocols
-* ONTAP 7 Mode as a backend for Cinder with NFS or iSCSI data-transfer protocols
+* Data ONTAP 7-Mode as a backend for Cinder with NFS or iSCSI data-transfer protocols
-* E-Series as a backend for Cinder with iSCSI data-transfer protocol
+* E-Series or EF-Series as a backend for Cinder with iSCSI data-transfer protocol
-* Multibackend: A supported NetApp storage with any default Cinder backend, either LVM over iSCSI or Ceph
+* Supports multi backend feature. The plugin does not overwrite ``enabled_backends`` option
-* Supports all NetApp driver options to be configured
+  thereby allowing use other plugins for Cinder.
+* Allows using NetApp as a backend for Cinder along with MOS default backends - ``LVM over iSCSI`` or ``Ceph``
+* Supports all configuration options of NetApp Cinder driver for Liberty
 
 
 Requirements
@@ -31,26 +34,29 @@ Requirements
 Requirement             Version/Comment
 ======================= =================================
 Fuel                    8.0
-ONTAP or E-Series       All storage family is supported.
+NetApp Storage System   Clustered ONTAP Data
+
+                        Data ONTAP 7-Mode
+
+                        E-Series or EF-Series
 ======================= =================================
 
 
 Prerequisites
 -------------
-* If you plan to use the plugin with **ONTAP**, please make sure that it
+* If you plan to use the plugin with **Data ONTAP 7-Mode** or **Clustered ONTAP Data**, please make sure
-  is configured, up and running. For instructions, see `the official
+  that it is configured, up and running. For instructions, see `the official NetApp ONTAP documentation`_.
-  NetApp ONTAP documentation  <http://mysupport.netapp.com/documentation/productlibrary/index.html?productID=30092>`_.
 
 
-* If you plan to use the plugin with **E-Series**, please make sure that it
+* If you plan to use the plugin with **E-Series** or **EF-Series**, please make sure that it
-  is configured, up and running. For instructions, see `the official
+  is configured, up and running. For instructions, see `the official NetApp E-Series documentation`_.
-  NetApp E-Series documentation <https://mysupport.netapp.com/info/web/ECMP1658252.html>`_.
 
-Release Nodes
+Release Notes
 -------------
-* The plugin has been totally refactored to accordance with changes in OpenStack Liberty and MOS 8.0
+* Added true support of multi backends
-* All documented features of NetApp Cinder Driver are configurable
+* Legacy of CentOS support for iSCSI was removed
-* Plugin can change Cinder settings after deployment with wrong parameters. It requires manual actions
+* Added comments to source code
+* Documentation is updated\fixed
 
 Limitations
 -----------
@@ -60,3 +66,6 @@ Limitations
   * nfs-common
   * open-iscsi
   * multipath-tools
+
+.. _the official NetApp ONTAP documentation: http://mysupport.netapp.com/documentation/productlibrary/index.html?productID=30092
+.. _the official NetApp E-Series documentation: https://mysupport.netapp.com/info/web/ECMP1658252.html

doc/source/guide.rst

@@ -1,17 +1,15 @@
+=========================
 Configuring NetApp plugin
 =========================
 
-Once the Fuel Cinder NetApp  plugin has been installed, you can
+Once the Fuel Cinder NetApp plugin has been installed, you can create OpenStack environments that use NetApp storage as a Cinder backend.
-create OpenStack environments that use NetApp storage as a Cinder backend.
-
 
 #. Create an OpenStack environment using the Fuel UI wizard:
 
    .. image:: images/create_env.png
       :width: 90%
 
-#. Finish environment creation following
+#. Finish environment creation following `the instructions`_.
-   `the instructions <http://docs.openstack.org/developer/fuel-docs/userdocs/fuel-user-guide/create-environment/start-create-env.html>`_.
 
 #. Once the environment is created, open the **Settings** tab of the Fuel Web UI
    and then **Storage**. Scroll down the page. Select the **Cinder and NetApp integration**
@@ -20,84 +18,86 @@ create OpenStack environments that use NetApp storage as a Cinder backend.
    .. image:: images/select-checkbox.png
       :width: 40%
 
-#. Configure the plugin.Select **Multibackend enabled** checkbox
+#. Configure the plugin.Select **MOS Backend Enabled** checkbox
-   if you would like NetApp driver to be used as the Cinder Multibackend feature:
+   if you would like Cinder NetApp driver to be used along with default beckend for MOS Cinder:
 
-   .. image:: images/multibackend.png
+   .. image:: images/default_backend.png
       :width: 50%
 
 #. Choose storage family and storage protocol. Several options are available.
 
-   - If you plan to use ONTAP cluster mode through NFS, click **Ontap Cluster**
+   - If you plan to use Clustered Data mode through NFS, click **Clustered Data ONTAP**
-     radio button and select *nfs* option in **Netapp storage protocol**.
+     radio button and select *NFS* option in **NetApp Storage Protocol**.
      You should also choose NetApp transport type (http or https).
+
      Specify the following parameters in the text fields:
 
-     - Netapp username
+     - Username
-     - Netapp password
+     - Password
-     - Netapp server hostname
+     - NetApp Storage Hostname/IP
-     - NFS server
+     - CDOT Data LIF IP address
-     - NFS share(s)
+     - CDOT FlexVol volume junction path
-     - Netapp Vserver
+     - Storage Virtual Machine
 
      .. image:: images/cmode_nfs.png
         :width: 100%
 
-   - If you plan to use ONTAP cluster mode through iSCSI, click **Ontap Cluster**
+   - If you plan to use Clustered Data mode through iSCSI, click **Clustered Data ONTAP**
-     radiobutton and select *iscsi* option in **Netapp storage protocol**.
+     radiobutton and select *iSCSI* option in **NetApp Storage Protocol**.
      You should also choose NetApp transport type (http or https).
+
      Specify the following parameters in the text fields:
 
-     - Netapp username
+     - Username
-     - Netapp password
+     - Password
-     - Netapp server hostname
+     - NetApp Storage Hostname/IP
-     - Netapp Vserver
+     - Storage Virtual Machine
 
      .. image:: images/cmode_iscsi.png
         :width: 100%
 
-   - If you plan to use ONTAP 7 mode through NFS, click **Ontap 7mode**
+   - If you plan to use 7-Mode through NFS, click **Data ONTAP 7-Mode**
-     radiobutton and select *nfs* option in **Netapp storage protocol**.
+     radiobutton and select *NFS* option in **NetApp Storage Protocol**.
      You should also choose NetApp transport type (http or https).
+
      Specify the following parameters in the text fields:
 
-     - Netapp username
+     - Username
-     - Netapp password
+     - Password
-     - Netapp server hostname
+     - NetApp Storage Hostname/IP
-     - NFS server
+     - CDOT Data LIF IP address
-     - NFS share(s)
+     - CDOT FlexVol volume junction path
 
      .. image:: images/7mode_nfs.png
         :width: 100%
 
-   -  If you plan to use ONTAP 7 mode through iSCSI, click **Ontap 7mode**
+   - If you plan to use 7-Mode through iSCSI, click **Data ONTAP 7-Mode**
-      radiobutton and select *iscsi* option in **Netapp storage protocol**.
+     radiobutton and select *iSCSI* option in **NetApp Storage Protocol**.
      You should also choose NetApp transport type (http or https).
      Specify the following parameters in the text fields:
 
-     - Netapp username
+     - Username
-     - Netapp password
+     - Password
-     - Netapp server hostname
+     - NetApp Storage Hostname/IP
 
      .. image:: images/7mode_iscsi.png
         :width: 100%
 
-   - If you plan to use E-series, click **E-Series**
+   - If you plan to use E-Series or EF-Series, click **E-Series/EF-Series**
-     radiobutton and select the only available *iscsi* option in **Netapp storage protocol**.
+     radiobutton and select the only available *iSCSI* option in **NetApp Storage Protocol**.
      You should also choose NetApp transport type (http or https).
-     Specify the following parameters in the text fields: please specify the following parameters:
+     Specify the following parameters in the text fields:
 
-     - Netapp username
+     - Username
-     - Netapp password
+     - Password
-     - Netapp server hostname
+     - NetApp Storage Hostname/IP
-     - Netapp controller IPs
+     - Controller IPs
-     - Netapp SA password
+     - Storage Array Password
 
      .. image:: images/eseries.png
         :width: 100%
 
-#. Using *Nodes* tab,
+#. Using *Nodes* tab, `add nodes and assign roles to them`_.
-   `add nodes and assign roles to them <http://docs.openstack.org/developer/fuel-docs/userdocs/fuel-user-guide/configure-environment/add-nodes.html>`_.
    Please, note that all controller nodes **MUST** be configured with Cinder role as well.
 
 #. This step is needed only when local fuel mirrors are used
@@ -110,8 +110,12 @@ create OpenStack environments that use NetApp storage as a Cinder backend.
         - "open-iscsi"
         - "multipath-tools"
 
-#. Press `Deploy button <http://docs.openstack.org/developer/fuel-docs/userdocs/fuel-user-guide/deploy-environment/deploy-changes.html>`_
+#. Press `Deploy button`_ once you are done with environment configuration.
-   once you are done with environment configuration.
 
 #. When the deployment is done, you may perform functional testing.
-   You can find instructions in `NetApp Mirantis Unlocked Reference Architecture <http://content.mirantis.com/Mirantis-NetApp-Reference-Architecture-Landing-Page.html>`_, paragraph 8.3. 
+   You can find instructions in `NetApp Mirantis Unlocked Reference Architecture`_, paragraph 8.3. 
+
+.. _the instructions: http://docs.openstack.org/developer/fuel-docs/userdocs/fuel-user-guide/create-environment/start-create-env.html
+.. _add nodes and assign roles to them: http://docs.openstack.org/developer/fuel-docs/userdocs/fuel-user-guide/configure-environment/add-nodes.html
+.. _Deploy button: http://docs.openstack.org/developer/fuel-docs/userdocs/fuel-user-guide/deploy-environment/deploy-changes.html
+.. _NetApp Mirantis Unlocked Reference Architecture: http://content.mirantis.com/Mirantis-NetApp-Reference-Architecture-Landing-Page.html

doc/source/index.rst

@@ -1,5 +1,5 @@
 ============================================
-Guide to the Cinder NetApp plugin ver. 4.1.1
+Guide to the Cinder NetApp plugin ver. 4.2.1
 ============================================
 
 This document will guide you through the steps to install,

doc/source/installation.rst

@@ -1,28 +1,28 @@
+========================
 Installing NetApp plugin
 ========================
 
-
 To install the Cinder Netapp plugin, follow these steps:
 
 #. Download it from the `Fuel Plugins Catalog`_.
 
 #. Copy the plugin's RPM to the Fuel Master node (if you don't
    have the Fuel Master node, please see `the official
-   Mirantis OpenStack documentation <http://docs.openstack.org/developer/fuel-docs/userdocs/fuel-install-guide.html>`_)::
+   Mirantis OpenStack documentation`_::
 
-      [root@home ~]# scp cinder_netapp-4.1-4.1.1-1.noarch.rpm root@fuel-master:/tmp
+      [root@home ~]# scp cinder_netapp-4.2-4.2.1-1.noarch.rpm root@fuel-master:/tmp
 
-#. Log into Fuel Master node and install the plugin using the
+#. Log into Fuel Master node and install the plugin using the `Fuel CLI`_::
-   `Fuel CLI <http://docs.openstack.org/developer/fuel-docs/userdocs/fuel-user-guide/cli.html>`_::
 
-      [root@fuel-master ~]# fuel plugins --install cinder_netapp-4.1-4.1.1-1.noarch.rpm
+      [root@fuel-master ~]# fuel plugins --install cinder_netapp-4.2-4.2.1-1.noarch.rpm
 
 #. Verify that the plugin is installed correctly::
 
      [root@fuel-master ~]# fuel plugins
      id | name          | version | package_version
      ---|---------------|---------|----------------
-     1  | cinder_netapp | 4.1.1   | 4.0.0
+     1  | cinder_netapp | 4.2.1   | 4.0.0
-
 
 .. _Fuel Plugins Catalog: https://www.mirantis.com/products/openstack-drivers-and-plugins/fuel-plugins/
+.. _the official Mirantis OpenStack documentation: http://docs.openstack.org/developer/fuel-docs/userdocs/fuel-install-guide.html
+.. _Fuel CLI: http://docs.openstack.org/developer/fuel-docs/userdocs/fuel-user-guide/cli.html

doc/source/utilization.rst

@@ -1,12 +1,11 @@
+===========
 Utilization
 ===========
 
-
+Usage
-Using
 -----
 Since the plugin set up Cinder backend, to operate with plugin functionality you should use Cinder and set type ``netapp`` for volumes.
 
-
 Verification
 ------------
 To perform functional testing you should:
@@ -16,7 +15,6 @@ To perform functional testing you should:
 * Create a snapshot of this volume
 * Create a volume using the snapshot
 
-
 Troubleshooting
 ---------------
 * If anything is not working, first check ``cinder-volume.log`` file on Cinder node. It provides most information you need for troubleshooting

metadata.yaml

@@ -3,7 +3,7 @@ name: cinder_netapp
 # Human-readable name for your plugin
 title: Cinder and NetApp integration
 # Plugin version
-version: '4.2.0'
+version: '4.2.1'
 # Description
 description: Enables using NetApp as a Cinder backend
 # Required fuel version

specs/fuel-plugin-cinder-netapp-spec.rst

@@ -10,28 +10,27 @@ Fuel Cinder NetApp plugin specification
 
 Overview
 --------
-
+The plugin can replace Cinder default backend in MOS by Cinder NetApp backend or work in parallel. ``LVM over iSCSI`` and ``Ceph`` are two choices, which can be used as a default backend for Cinder. The plugin does not overwrite ``enabled_backends`` option that allows to use it with other plugins for Cinder backends.
-NetApp plugin can replace the Cinder LVM backend by Cinder Netapp Backend or work in parallel when deployed with multi-backend enabled. LVM is the default volume backend that uses local volumes managed by LVM.
 
 This repo contains all necessary files to build Cinder NetApp Fuel plugin.
 
 Problem description
-===================
+-------------------
-
 This integration should be supported with the upstream version of Fuel product. Mirantis Openstack 8.0 release has Pluggable Architecture feature, that prevents developers from bringing any changes to the core product. Instead, the NetApp integration functionality can be implemented as a plugin for Fuel.
 
 The plugin support following storage families:
- - ONTAP with Cluster Mode and 7 Mode
+ - Clustered Data ONTAP
- - E-series
+ - Data ONTAP 7-Mode
+ - E-Series/EF-Series
 
-User Story 1: ONTAP devices with all modes
+User Story 1: Clustered Data ONTAP devices with NFS and iSCSI modes
----------------------------------------------------
+-------------------------------------------------------------------
+This case will provide availability to configure OpenStack compute instances to access Clustered Data ONTAP storage systems.
+To enable this functionality following changes should be added.
 
-This case will provide availability to configure OpenStack compute instances to access Data ONTAP storage systems. To enable this functionality following changes should be added:
+Clustered Data ONTAP via NFS:
-
+=============================
-ONTAP with Cluster Mode via NFS:
+ * All cinder hosts should have following configuration in *<cinder.conf>*::
-
-* All cinder hosts should have following configuration in *<cinder.conf>*::
 
     [cinder_netapp]
       volume_backend_name = cinder_netapp
@@ -48,14 +47,14 @@ ONTAP with Cluster Mode via NFS:
 
   Where ``netapp_login``, ``netapp_password``, ``$netapp_server_hostname``, ``netapp_transport_type``, ``netapp_storage_family``, ``netapp_storage_protocol``, ``netapp_vserver`` should be configured through the Fuel Web UI in Cinder and NetApp integration section of the **Settings** tab.
 
-* All compute hosts should satisfy following requirements:
+ * All compute hosts should satisfy following requirements:
 
    - ``nfs-common`` should be installed
    - Ensure that ``nfs`` service is enabled and running in the system
 
-ONTAP with Cluster Mode via iSCSI:
+Clustered Data ONTAP via iSCSI:
-
+===============================
-* All cinder hosts should have following configuration in *<cinder.conf>*::
+ * All cinder hosts should have following configuration in *<cinder.conf>*::
 
     [cinder_netapp]
       volume_backend_name = cinder_netapp
@@ -71,13 +70,17 @@ ONTAP with Cluster Mode via iSCSI:
 
   Where ``netapp_login``, ``netapp_password``, ``$netapp_server_hostname``, ``netapp_transport_type``, ``netapp_storage_family``, ``netapp_storage_protocol``, ``netapp_vserver`` should be configured through the Fuel Web UI in Cinder and NetApp integration section of the **Settings** tab.
 
-* All compute hosts should satisfy following requirements:
+ * All compute hosts should satisfy following requirements:
 
    - ``open-iscsi`` and ``multipath-tools`` should be installed
 
-ONTAP with 7 Mode via NFS:
+User Story 2: Data ONTAP 7-Mode devices with NFS and iSCSI modes
+----------------------------------------------------------------
+This case will provide availability to configure OpenStack compute instances to access Data ONTAP 7-Mode storage systems. To enable this functionality following changes should be added:
 
-* All cinder hosts should have following configuration in *<cinder.conf>*::
+Data ONTAP 7-Mode via NFS:
+==========================
+ * All cinder hosts should have following configuration in *<cinder.conf>*::
 
     [cinder_netapp]
       volume_backend_name = cinder_netapp
@@ -94,14 +97,14 @@ ONTAP with 7 Mode via NFS:
 
   Where ``netapp_login``, ``netapp_password``, ``$netapp_server_hostname``, ``netapp_transport_type``, ``netapp_storage_family``, ``netapp_storage_protocol``, ``netapp_vfilter`` should be configured through the Fuel Web UI in Cinder and NetApp integration section of the **Settings** tab.
 
-* All compute hosts should satisfy following requirements:
+ * All compute hosts should satisfy following requirements:
 
    - ``nfs-common`` should be installed.
    - Ensure that ``nfs`` service is enabled and running in the system
 
-ONTAP with 7 Mode via iSCSI:
+Data ONTAP 7-Mode via iSCSI:
-
+============================
-* All cinder hosts should have following configuration in *<cinder.conf>*::
+ * All cinder hosts should have following configuration in *<cinder.conf>*::
 
     [cinder_netapp]
       volume_backend_name = cinder_netapp
@@ -117,16 +120,17 @@ ONTAP with 7 Mode via iSCSI:
 
   Where ``netapp_login``, ``netapp_password``, ``$netapp_server_hostname``, ``netapp_transport_type``, ``netapp_storage_family``, ``netapp_storage_protocol``, ``netapp_vfiler`` should be configured through the Fuel Web UI in Cinder and NetApp integration section of the **Settings** tab.
 
-* All compute hosts should satisfy following requirements:
+ * All compute hosts should satisfy following requirements:
 
    - ``open-iscsi`` and ``multipath-tools`` should be installed
 
-User Story 2: E-series devices
+User Story 3: E-Series/EF-Series devices with iSCSI mode
--------------------------------------------------------------
+--------------------------------------------------------
+This case will provide availability to configure OpenStack compute instances to access E-Series/EF-Series storage systems. To enable this functionality following changes should be added:
 
-This case will provide availability to configure OpenStack compute instances to access E-series storage systems. To enable this functionality following changes should be added:
+E-Series/EF-Series via iSCSI:
-
+=============================
-* All cinder hosts should have following configuration in *<cinder.conf>*::
+ * All cinder hosts should have following configuration in *<cinder.conf>*::
 
     [cinder_netapp]
       volume_backend_name = cinder_netapp
@@ -145,83 +149,72 @@ This case will provide availability to configure OpenStack compute instances to
 
   Where ``netapp_login``, ``netapp_password``, ``$netapp_server_hostname``, ``netapp_transport_type``, ``netapp_storage_family``, ``netapp_storage_protocol``, ``netapp_controller_ips``, ``netapp_sa_password`` should be configured through the Fuel Web UI in Cinder and NetApp integration section of the **Settings** tab.
 
-* All compute hosts should satisfy following requirements:
+ * All compute hosts should satisfy following requirements:
 
    - ``open-iscsi`` and ``multipath-tools`` should be installed
 
-Alternatives
----------------
 
-There are no known alternatives for this plugin, although all steps can be performed manually.
+Affects
+-------
 
 REST API impact
----------------
+===============
-
 None.
 
 Upgrade impact
---------------
+==============
-
+Upgrading should be tested explicitly with this plugin installed and NetApp storage enabled.
-Upgrading should be tested explicitly with this plugin installed and NetApp storage cluster enabled.
 
 Security impact
----------------
+===============
-
+This plugin uses credentials that were used during NetApp storage setup. No impact on OpenStack services.
-This plugin uses credentials that were used during NetApp cluster setup. No impact on OpenStack services.
 
 Notifications impact
---------------------
+====================
-
 None.
 
 Other end user impact
----------------------
+=====================
-
 None.
 
 Plugin impact
--------------
+=============
-
 This plugin should not impact other plugins until they do not modify the same settings for Cinder configuration.
 
 Other deployer impact
----------------------
+=====================
 
 Developer impact
-----------------
+================
 
+Documentation Impact
+====================
+Reference to this plugin should be added to main Fuel documentation.
 
 Implementation
-==============
+--------------
 
 Work Items
-----------
+==========
-
 * Create fuel-plugin-cinder-netapp plugin
-
 * Develop the Fuel Web UI part of the plugin
-
 * Add puppet support for all configuration cases
-
 * Write documentation (User Guide)
 
 Dependencies
 ============
-
 * Ubuntu 14.04 support in MOS
 
 Testing
-========
+-------
+Plugin should pass functional tests executed manually.
 
-Plugin should pass tempest framework tests.
+Alternatives
-
+---------------
-Documentation Impact
+There are no known alternatives for this plugin, although all steps can be performed manually.
-====================
-
-Reference to this plugin should be added to main Fuel documentation.
 
 References
-==========
+----------
+[1] http://netapp.github.io/openstack-deploy-ops-guide/liberty/content/section_cinder-configuration.html
 
-[1] http://docs.openstack.org/icehouse/config-reference/content/netapp-volume-driver.html
 [2] https://blueprints.launchpad.net/fuel/+spec/support-ubuntu-trusty