From: Dimitri Savineau <dsavinea@redhat.com>
Date: Thu, 8 Sep 2016 17:16:30 +0000 (-0400)
Subject: Cinder: Add iSCSI protocol parameter
X-Git-Tag: opnfv-6.0.0~557^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=235e769fa9847edef10da1f7290f6cc1ac96806c;p=apex-puppet-tripleo.git

Cinder: Add iSCSI protocol parameter

This patch allows to spefify the iscsi_protocol in the iSCSI cinder
backend when we want to use iSCSI Extensions for RDMA (iSER).
The default value remains 'iscsi'.

Change-Id: I6d2c4d71fb3ab1f7749d6e1defb59e86b9364cc1
---

diff --git a/manifests/profile/base/cinder/volume/iscsi.pp b/manifests/profile/base/cinder/volume/iscsi.pp
index 8baaf1c..4d333c8 100644
--- a/manifests/profile/base/cinder/volume/iscsi.pp
+++ b/manifests/profile/base/cinder/volume/iscsi.pp
@@ -29,6 +29,10 @@
 #   (Optional) The iscsi helper to use
 #   Defaults to 'tgtadm'
 #
+# [*cinder_iscsi_protocol*]
+#   (Optional) The iscsi protocol to use
+#   Defaults to 'iscsi'
+#
 # [*cinder_lvm_loop_device_size*]
 #   (Optional) The size (in MB) of the LVM loopback volume
 #   Defaults to '10280'
@@ -42,6 +46,7 @@ class tripleo::profile::base::cinder::volume::iscsi (
   $cinder_iscsi_address,
   $backend_name                = hiera('cinder::backend::iscsi::volume_backend_name', 'tripleo_iscsi'),
   $cinder_iscsi_helper         = 'tgtadm',
+  $cinder_iscsi_protocol       = 'iscsi',
   $cinder_lvm_loop_device_size = '10280',
   $step                        = hiera('step'),
 ) {
@@ -58,6 +63,7 @@ class tripleo::profile::base::cinder::volume::iscsi (
     cinder::backend::iscsi { $backend_name :
       iscsi_ip_address => normalize_ip_for_uri($cinder_iscsi_address),
       iscsi_helper     => $cinder_iscsi_helper,
+      iscsi_protocol   => $cinder_iscsi_protocol,
     }
   }