Update Documentatio to add Fuel 7.0

Change-Id: I5fdb2df9660cb48559583bac401eb4220d1c6f57

README.md

@@ -35,12 +35,12 @@ To install the ScaleIO-Cinder plugin, follow these steps:
 
 2. Copy the plugin file to the Fuel Master node. Follow the [Quick start guide](https://software.mirantis.com/quick-start/) if you don't have a running Fuel Master node yet.
     ```
-    $ scp scaleio-cinder-1.0-1.0.0-1.noarch.rpm root@<Fuel Master node IP address>:/tmp/
+    $ scp scaleio-cinder-1.5-1.5.0-1.noarch.rpm root@<Fuel Master node IP address>:/tmp/
     ```
 
 3. Log into the Fuel Master node and install the plugin using the fuel command line.
     ```
-    $ fuel plugins --install /tmp/scaleio-cinder-1.0-1.0.0-1.noarch.rpm
+    $ fuel plugins --install /tmp/scaleio-cinder-1.5-1.5.0-1.noarch.rpm
     ```
 
 4. Verify that the plugin is installed correctly.
@@ -92,7 +92,7 @@ need further instructions about how to build the Fuel Plugin Builder.*
 
 7. Now you have created an RPM file that you can install using the steps described above. The RPM file will be located in:
     ```
-    $ ./fuel-plugin-scaleio-cinder/scaleio-cinder-1.0-1.0.0-1.noarch.rpm
+    $ ./fuel-plugin-scaleio-cinder/scaleio-cinder-1.5-1.5.0-1.noarch.rpm
     ```
 
 # User Guide

deployment_scripts/puppet/install_scaleio_compute/manifests/centos.pp

@@ -27,7 +27,7 @@ class install_scaleio_compute::centos
 
   file { 'scaleiolibvirtdriver.py':
     path  => '/usr/lib/python2.6/site-packages/nova/virt/libvirt/scaleiolibvirtdriver.py',
-    source => 'puppet:///modules/install_scaleio_compute/scaleiolibvirtdriver.py',
+    source => 'puppet:///modules/install_scaleio_compute/6.1/scaleiolibvirtdriver.py',
     mode  => '644',
     owner => 'root',
     group => 'root',

deployment_scripts/puppet/install_scaleio_compute/manifests/ubuntu.pp

@@ -5,50 +5,11 @@ class install_scaleio_compute::ubuntu
   $nova_service = 'nova-compute'
   $mdm_ip_1 = $plugin_settings['scaleio_mdm1']
   $mdm_ip_2 = $plugin_settings['scaleio_mdm2']
-
+  $version  = hiera('fuel_version')
+  
 #install ScaleIO SDC package
-
-  # file { 'emc-scaleio-sdc.deb':
-  #  path  => '/tmp/emc-scaleio-sdc.deb',
-  #  source => 'puppet:///modules/install_scaleio_compute/emc.deb',
-  #  mode  => '644',
-  #  owner => 'root',
-  #  group => 'root',
- # }->
-
- #exec {"Install sdc":
- #   command => "bash -c 'dpkg -i /tmp/emc-scaleio-sdc.deb'",
- #   path    => ['/usr/bin', '/bin','/usr/local/sbin','/usr/sbin','/sbin' ],
- #}->
-
-package{'emc-scaleio-sdc':
- ensure => installed,
-}->
- exec {"Add MDM to drv-cfg":
-    command => "bash -c 'echo mdm ${mdm_ip_1},${mdm_ip_2}  >> /bin/emc/scaleio/drv_cfg.txt'",
-    path    =>  ['/usr/bin', '/bin','/usr/local/sbin','/usr/sbin','/sbin' ],
- }->
-
-
- exec {"Start SDC":
-    command => "bash -c '/etc/init.d/scini restart'",
-    path    =>  ['/usr/bin', '/bin','/usr/local/sbin','/usr/sbin','/sbin' ],
- }->
-
   
-  
+if($version == '6.1') {
-  #Configure nova-compute
-  ini_subsetting { 'nova-volume_driver':
-    ensure  => present,
-    path    => '/etc/nova/nova.conf',
-    subsetting_separator => ',',
-    section => 'libvirt',
-    setting => 'volume_drivers',
-    subsetting => 'scaleio=nova.virt.libvirt.scaleiolibvirtdriver.LibvirtScaleIOVolumeDriver',
-    notify => Service[$nova_service],
-  }->
-  
-if(hiera('fuel_version') == '6.1') {
   file { 'scaleiolibvirtdriver.py':
     path  => '/usr/lib/python2.7/dist-packages/nova/virt/libvirt/scaleiolibvirtdriver.py',
     source => 'puppet:///modules/install_scaleio_compute/6.1/scaleiolibvirtdriver.py',
@@ -57,7 +18,10 @@ if(hiera('fuel_version') == '6.1') {
     group => 'root',
     notify => Service[$nova_service],
   }
-  }else{
+
+}
+else
+{
 	  file { 'driver.py':
 		path  => '/usr/lib/python2.7/dist-packages/nova/virt/libvirt/driver.py',
 		source => 'puppet:///modules/install_scaleio_compute/7.0/driver.py',
@@ -74,6 +38,33 @@ if(hiera('fuel_version') == '6.1') {
 		group => 'root',
 		notify => Service[$nova_service],  
 	  } 
+  }
+
+package{'emc-scaleio-sdc':
+ ensure => installed,
+}->
+ exec {"Add MDM to drv-cfg":
+    command => "bash -c 'echo mdm ${mdm_ip_1},${mdm_ip_2}  >> /bin/emc/scaleio/drv_cfg.txt'",
+    path    =>  ['/usr/bin', '/bin','/usr/local/sbin','/usr/sbin','/sbin' ],
+ }->
+
+
+ exec {"Start SDC":
+    command => "bash -c '/etc/init.d/scini restart'",
+    path    =>  ['/usr/bin', '/bin','/usr/local/sbin','/usr/sbin','/sbin' ],
+ }->
+
+
+
+  #Configure nova-compute
+  ini_subsetting { 'nova-volume_driver':
+    ensure  => present,
+    path    => '/etc/nova/nova.conf',
+    subsetting_separator => ',',
+    section => 'libvirt',
+    setting => 'volume_drivers',
+    subsetting => 'scaleio=nova.virt.libvirt.scaleiolibvirtdriver.LibvirtScaleIOVolumeDriver',
+    notify => Service[$nova_service],
   }->
   
 

deployment_scripts/puppet/install_scaleio_controller/manifests/centos.pp

@@ -16,7 +16,7 @@ class install_scaleio_controller::centos
 #2. Copy ScaleIO Files
   file { 'scaleio.py':
     path => '/usr/lib/python2.6/site-packages/cinder/volume/drivers/emc/scaleio.py',
-    source => 'puppet:///modules/install_scaleio_controller/scaleio.py',
+    source => 'puppet:///modules/install_scaleio_controller/6.1/scaleio.py',
     mode  => '644',
     owner => 'root',
     group => 'root',

deployment_scripts/puppet/install_scaleio_controller/manifests/ubuntu.pp

@@ -7,66 +7,8 @@ class install_scaleio_controller::ubuntu
   $mdm_ip_2 = $plugin_settings['scaleio_mdm2']
   $admin =  $plugin_settings['scaleio_Admin']
   $password = $plugin_settings['scaleio_Password']
-  $volume_type = "scaleio-thin" 
+  $volume_type = "scaleio-thin"
-#1. Install SDC package
+  $version = hiera('fuel_version')
-   #file { 'emc-scaleio-sdc.deb':
-   # path  => '/tmp/emc-scaleio-sdc.deb',
-   # source => 'puppet:///modules/install_scaleio_controller/emc.deb',
-   # mode  => '644',
-   # owner => 'root',
-   # group => 'root',
-# }->
-
-# exec {"Install sdc":
-#    command => "bash -c 'dpkg -i /tmp/emc-scaleio-sdc.deb'",
-#    path    =>  ['/usr/bin', '/bin','/usr/local/sbin','/usr/sbin','/sbin' ],
-# }->
-
-  package {'emc-scaleio-sdc':
-    ensure => installed ,
-  }->
- exec {"Add MDM to drv-cfg":
-    command => "bash -c 'echo mdm  ${mdm_ip_1} >>/bin/emc/scaleio/drv_cfg.txt'",
-    path    =>  ['/usr/bin', '/bin','/usr/local/sbin','/usr/sbin','/sbin' ],
-
- }->
-
-
- exec {"Start SDC":
-    command => "bash -c '/etc/init.d/scini restart'",
-    path    =>  ['/usr/bin', '/bin','/usr/local/sbin','/usr/sbin','/sbin' ],
-
- }->
-
-#2. Copy ScaleIO Files
-  if(hiera('fuel_version') == '6.1') {
-	  file { 'scaleio_6.py':
-		path => '/usr/lib/python2.7/dist-packages/cinder/volume/drivers/emc/scaleio.py',
-		source => 'puppet:///modules/install_scaleio_controller/6.1/scaleio.py',
-		mode  => '644',
-		owner => 'root',
-		group => 'root',
-	  }
-  
-  }else{
-	  file { 'scaleio_7.py':
-		path  => '/usr/lib/python2.7/dist-packages/nova/virt/libvirt/driver.py',
-		source => 'puppet:///modules/install_scaleio_controller/7.0/scaleio.py',
-		mode  => '644',
-		owner => 'root',
-		group => 'root',
-		notify => Service[$nova_service],  
-	  } 
-  } ->
-  
-  file { 'scaleio.filters':
-    path => '/etc/cinder/rootwrap.d/scaleio.filters',
-    source => 'puppet:///modules/install_scaleio_controller/scaleio.filters',
-    mode  => '644',
-    owner => 'root',
-    group => 'root',
-    before => File['cinder_scaleio.config'], 
-  }
 
 # 3. Create config for ScaleIO
   $cinder_scaleio_config = "[scaleio]
@@ -80,6 +22,55 @@ round_volume_capacity=True
 force_delete=True
 verify_server_certificate=False
 "
+  
+if($version == '6.1') {
+          file { 'scaleio_6.py':
+                path => '/usr/lib/python2.7/dist-packages/cinder/volume/drivers/emc/scaleio.py',
+                source => 'puppet:///modules/install_scaleio_controller/6.1/scaleio.py',
+                mode  => '644',
+                owner => 'root',
+                group => 'root',
+          }
+
+}
+else
+{
+          file { 'scaleio_7.py':
+                path  => '/usr/lib/python2.7/dist-packages/cinder/volume/drivers/emc/scaleio.py',
+                source => 'puppet:///modules/install_scaleio_controller/7.0/scaleio.py',
+                mode  => '644',
+                owner => 'root',
+                group => 'root',
+
+          }
+  }  
+
+ package {'emc-scaleio-sdc':
+    ensure => installed ,
+ }->
+
+ exec {"Add MDM to drv-cfg":
+    command => "bash -c 'echo mdm  ${mdm_ip_1} >>/bin/emc/scaleio/drv_cfg.txt'",
+    path    =>  ['/usr/bin', '/bin','/usr/local/sbin','/usr/sbin','/sbin' ],
+
+ }->
+
+exec {"Start SDC": 
+    command => "bash -c '/etc/init.d/scini restart'",
+    path    =>  ['/usr/bin', '/bin','/usr/local/sbin','/usr/sbin','/sbin' ],
+
+ }->
+
+file { 'scaleio.filters':
+    path => '/etc/cinder/rootwrap.d/scaleio.filters',
+    source => 'puppet:///modules/install_scaleio_controller/scaleio.filters',
+    mode  => '644',
+    owner => 'root',
+    group => 'root',
+    before => File['cinder_scaleio.config'], 
+  }->
+
+# 3. Create config for ScaleIO
 
   file { 'cinder_scaleio.config':
     ensure  => present,

doc/source/installation.rst

@@ -8,14 +8,14 @@ To install the ScaleIO-Cinder Fuel plugin:
 #. Copy the *rpm* file to the Fuel Master node:
    ::
 
-      [root@home ~]# scp scaleio-cinder-1.0-1.0.0-1.noarch.rpm root@fuel:/tmp
+      [root@home ~]# scp scaleio-cinder-1.5-1.5.0-1.noarch.rpm root@fuel:/tmp
 
 #. Log into Fuel Master node and install the plugin using the
-   `Fuel CLI <https://docs.mirantis.com/openstack/fuel/fuel-6.1/user-guide.html#using-fuel-cli>`_:
+   `Fuel CLI <https://docs.mirantis.com/openstack/fuel/fuel-7.0/user-guide.html#using-fuel-cli>`_:
 
    ::
 
-      [root@fuel ~]# fuel plugins --install scaleio-cinder-1.0-1.0.0-1.noarch.rpm
+      [root@fuel ~]# fuel plugins --install scaleio-cinder-1.5-1.5.0-1.noarch.rpm
 
 #. Verify that the plugin is installed correctly:
    ::
@@ -23,7 +23,7 @@ To install the ScaleIO-Cinder Fuel plugin:
      [root@fuel-master ~]# fuel plugins
      id | name          | version | package_version
      ---|---------------|---------|----------------
-     1  | scaleio-cinder| 1.0.0   | 1.0.0
+     1  | scaleio-cinder| 1.5.0   | 2.0.0
 
 
 .. raw:: pdf
@@ -36,9 +36,9 @@ Once the plugin has been copied and installed at the
 Fuel Master node, you can configure the nodes and set the parameters for the plugin:
 
 #. Start by creating a new OpenStack environment following the
-   `Mirantis OpenStack User Guide <https://docs.mirantis.com/openstack/fuel/fuel-6.1/user-guide.html#create-a-new-openstack-environment>`_.
+   `Mirantis OpenStack User Guide <https://docs.mirantis.com/openstack/fuel/fuel-7.0/user-guide.html#create-a-new-openstack-environment>`_.
 
-#. `Configure your environment <https://docs.mirantis.com/openstack/fuel/fuel-6.1/user-guide.html#configure-your-environment>`_.
+#. `Configure your environment <https://docs.mirantis.com/openstack/fuel/fuel-7.0/user-guide.html#configure-your-environment>`_.
 
 	.. image:: images/scaleio-cinder-install-2.png
 
@@ -80,7 +80,7 @@ Fuel Master node, you can configure the nodes and set the parameters for the plu
 
 	   
 #. You can run the network verification check and
-   `deploy changes <https://docs.mirantis.com/openstack/fuel/fuel-6.1/user-guide.html#deploy-changes>`_ then.
+   `deploy changes <https://docs.mirantis.com/openstack/fuel/fuel-7.0/user-guide.html#deploy-changes>`_ then.
 
 #. After deployment is completed, you should see a success message:
 

doc/source/introduction.rst

@@ -49,7 +49,7 @@ These are the plugin requirements:
 +--------------------------------------------------------------------------------+--------------------------------+
 | ScaleIO Version                                                                | >= 1.32                        |
 +--------------------------------------------------------------------------------+--------------------------------+
-| Controller and Compute Nodes' Operative System                                 | CentOS/RHEL 6.5                |
+| Controller and Compute Nodes' Operative System                                 | CentOS 6.5/Ubuntu 14.04 LTS    |
 +--------------------------------------------------------------------------------+--------------------------------+
 | OpenStack Cluster (Controller/cinder-volume node) can access ScaleIO Cluster   | via a TCP/IP Network           |
 +--------------------------------------------------------------------------------+--------------------------------+

metadata.yaml

@@ -34,6 +34,6 @@ releases:
     mode: ['ha', 'multinode']
     deployment_scripts_path: deployment_scripts/
     repository_path: repositories/ubuntu
-# Version of plugin package
+#Version of plugin package
 package_version: '2.0.0'