From: Jenkins <jenkins@review.openstack.org>
Date: Fri, 10 Feb 2017 21:56:56 +0000 (+0000)
Subject: Merge "Add module to support ScaleIO backend in Cinder"
X-Git-Tag: opnfv-6.0.0~348
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=e4e9f85c648d33079f1fdc33d8a097977ab1b3c6;p=apex-puppet-tripleo.git

Merge "Add module to support ScaleIO backend in Cinder"
---

e4e9f85c648d33079f1fdc33d8a097977ab1b3c6
diff --cc manifests/profile/base/cinder/volume.pp
index 79238c0,03bb767..9fb1594
--- a/manifests/profile/base/cinder/volume.pp
+++ b/manifests/profile/base/cinder/volume.pp
@@@ -120,9 -125,16 +125,16 @@@ class tripleo::profile::base::cinder::v
        $cinder_rbd_backend_name = undef
      }
  
+     if $cinder_enable_scaleio_backend {
+       include ::tripleo::profile::base::cinder::volume::scaleio
+       $cinder_scaleio_backend_name = hiera('cinder::backend::scaleio::volume_backend_name', 'tripleo_scaleio')
+     } else {
+       $cinder_scaleio_backend_name = undef
+     }
+ 
      $backends = delete_undef_values([$cinder_iscsi_backend_name,
                                        $cinder_rbd_backend_name,
 -                                      $cinder_eqlx_backend_name,
 +                                      $cinder_dellps_backend_name,
                                        $cinder_dellsc_backend_name,
                                        $cinder_hpelefthand_backend_name,
                                        $cinder_netapp_backend_name,