set version 2.1.2 and fix docs accordingly

Change-Id: Id1b7a1d39586f3b3e46317ef715f2f3cd57eb95d

README.md

@@ -35,12 +35,11 @@ The `ScaleIO` plugin allows to:
 ## Limitations
 
 1. Plugin supports Ubuntu environment only.
-2. The only hyper converged environment is supported - there is no separate ScaleIO Storage nodes.
-3. Multi storage backend is not supported.
-4. It is not possible to use different backends for persistent and ephemeral volumes.
-5. Disks for SDS-es should be unallocated before deployment via FUEL UI or cli.
-6. MDMs and Gateways are deployed together and only onto controller nodes.
-7. Adding and removing node(s) to/from the OpenStack cluster won't re-configure the ScaleIO.
+2. Multi storage backend is not supported.
+3. It is not possible to use different backends for persistent and ephemeral volumes.
+4. Disks for SDS-es should be unallocated before deployment via FUEL UI or cli.
+5. MDMs and Gateways are deployed together and only onto controller nodes.
+6. Adding and removing node(s) to/from the OpenStack cluster won't re-configure the ScaleIO.
 
 # Installation Guide
 

doc/source/guide.rst

@@ -79,9 +79,20 @@ Plugin configuration
     .. image:: images/settings3.png
        :width: 80%
 
-  \c. In case you want to specify different storage pools for different devices provide a list of pools corresponding to device paths, e.g. 'pool1,pool2' and '/dev/sdb,/dev/sdc' will assign /dev/sdb for the pool1 and /dev/sdc for the pool2.
+  \c. In order to use separate ScaleIO storage nodes disable check-box 'Hyper-converged deployment'.
+      In such kind of depllyment ScaleIO SDS component will be deployed only on the nodes with ScaleIO role.
+      Although there is a role for ScaleIO Storage the user still has to point devices in the 'Storage devices' settings.
+      The role frees user from making ScaleIO disks unassigned. User can use devices with ScaleIO
+      role as 'Storage devices' (with mapping to different storage pools as described below) as well as
+      'XtremCache devices' (it is expected that user is aware which device are SSD actually,
+      the plugin does not perform such check).
 
-  \d. Make disks for ScaleIO SDS devices unallocated. These disks will be cleaned up and added to SDSs as storage devices. Note, that because of current Fuel framework limitation it is needed to keep some space for Cinder and Nova roles.
+    .. image:: images/devices_scaleio.png
+       :width: 80%
+
+  \d. In case of hyper-converged deployment enabled make disks for ScaleIO SDS devices unallocated.
+      These disks will be cleaned up and added to SDSs as storage devices.
+      Note, that because of current Fuel framework limitation it is needed to keep some space for Cinder and Nova roles.
 
     .. image:: images/devices_compute.png
        :width: 80%
@@ -89,6 +100,8 @@ Plugin configuration
     .. image:: images/devices_controller.png
        :width: 80%
 
+  \e. In case you want to specify different storage pools for different devices provide a list of pools corresponding to device paths, e.g. 'pool1,pool2' and '/dev/sdb,/dev/sdc' will assign /dev/sdb for the pool1 and /dev/sdc for the pool2.
+
 \3. In order to use existing ScaleIO cluster
 
   \a. Enable checkbox 'Use existing ScaleIO'

doc/source/release_notes.rst

@@ -1,3 +1,19 @@
+Release Notes v2.1.2
+====================
+
+
+New Features
+----------------
+
+1. Non-hyperconverged deployment support. Separate ScaleIO role for ScaleIO Storage nodes.
+To enable this feature there is appropriate check-box in the plugin's settings.
+Note, that although there is a role for ScaleIO Storage the user still has to point devices
+in the 'Storage devices' settings. The role frees user from making
+ScaleIO disks unassigned. User can use devices with ScaleIO role as 'Storage devices' (with
+mapping to different storage pools) as well as 'XtremCache devices' (it is expected that user
+is aware which device are SSD actually, the plugin does not perform such check).
+
+
 Release Notes v2.1.1
 ====================
 

metadata.yaml

@@ -5,7 +5,7 @@ name: scaleio
 title: ScaleIOv2.0 plugin
 
 # Plugin version
-version: '2.1.1'
+version: '2.1.2'
 
 # Description
 description: This plugin deploys and enables EMC ScaleIO ver. 2.0 as the block storage backend