aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-10-03 07:49:58 +0000
committerGerrit Code Review <review@openstack.org>2016-10-03 07:49:58 +0000
commit40a9a3d2ff02b27022bbd820b1e2af806e0a359b (patch)
treebd8151b0d14cfdeb72d6ce5a5af19652f22aa6f9
parent675cb627fec54732c5db4006788931d741dd79e2 (diff)
parent235e769fa9847edef10da1f7290f6cc1ac96806c (diff)
Merge "Cinder: Add iSCSI protocol parameter"
-rw-r--r--manifests/profile/base/cinder/volume/iscsi.pp6
1 files changed, 6 insertions, 0 deletions
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,
}
}