From ff20b533981e893b68bab0211e81265e098dee0c Mon Sep 17 00:00:00 2001
From: Stig Telfer <stig.openstack@telfer.org>
Date: Thu, 2 Jun 2016 20:42:03 +0100
Subject: Added support for pass-through iSER configuration

iSCSI-over-RDMA involves some configuration file changes that
must be propagated through TripleO.

Change-Id: I62a23909982f10358a2d19d2e85f2a6d2ba6496e
Depends-On: I6d2c4d71fb3ab1f7749d6e1defb59e86b9364cc1
---
 capabilities-map.yaml              |  6 ++++++
 environments/cinder-iser.yaml      | 19 +++++++++++++++++++
 puppet/services/cinder-volume.yaml |  5 +++++
 3 files changed, 30 insertions(+)
 create mode 100644 environments/cinder-iser.yaml

diff --git a/capabilities-map.yaml b/capabilities-map.yaml
index ae747621..1eaa99ae 100644
--- a/capabilities-map.yaml
+++ b/capabilities-map.yaml
@@ -405,6 +405,12 @@ topics:
               Enables a Cinder EQLX backend, configured via puppet
             requires:
               - overcloud-resource-registry-puppet.yaml
+          - file: environments/cinder-iser.yaml
+            title: Cinder iSER backend
+            description: >
+              Enable a Cinder iSER RDMA backend, configured via puppet
+            requires:
+              - overcloud-resource-registry-puppet.yaml
       - title: Externally managed Ceph
         description: >
           Enable the use of an externally managed Ceph cluster
diff --git a/environments/cinder-iser.yaml b/environments/cinder-iser.yaml
new file mode 100644
index 00000000..5eae7c04
--- /dev/null
+++ b/environments/cinder-iser.yaml
@@ -0,0 +1,19 @@
+parameter_defaults:
+
+  ## Whether to enable iscsi backend for Cinder.
+  CinderEnableIscsiBackend: true
+  CinderISCSIProtocol: 'iser'
+  CinderISCSIHelper: 'lioadm'
+
+  ## Whether to enable rbd (Ceph) backend for Cinder.
+  CinderEnableRbdBackend: false
+
+  ## Whether to enable NFS backend for Cinder.
+  CinderEnableNfsBackend: false
+
+  ## Whether to enable rbd (Ceph) backend for Nova ephemeral storage.
+  NovaEnableRbdBackend: false
+
+  ## Glance backend can be either 'rbd' (Ceph), 'swift' or 'file'.
+  ## GlanceBackend: swift
+
diff --git a/puppet/services/cinder-volume.yaml b/puppet/services/cinder-volume.yaml
index 82e16f39..52995639 100644
--- a/puppet/services/cinder-volume.yaml
+++ b/puppet/services/cinder-volume.yaml
@@ -20,6 +20,10 @@ parameters:
     default: lioadm
     description: The iSCSI helper to use with cinder.
     type: string
+  CinderISCSIProtocol:
+    default: iscsi
+    description: Whether to use TCP ('iscsi') or iSER RDMA ('iser') for iSCSI
+    type: string
   CinderLVMLoopDeviceSize:
     default: 10280
     description: The size of the loopback file used by the cinder LVM driver.
@@ -97,6 +101,7 @@ outputs:
                   SERVERS: {get_param: CinderNfsServers}
             tripleo::profile::base::cinder::volume::iscsi::cinder_lvm_loop_device_size: {get_param: CinderLVMLoopDeviceSize}
             tripleo::profile::base::cinder::volume::iscsi::cinder_iscsi_helper: {get_param: CinderISCSIHelper}
+            tripleo::profile::base::cinder::volume::iscsi::cinder_iscsi_protocol: {get_param: CinderISCSIProtocol}
             tripleo::profile::base::cinder::volume::rbd::cinder_rbd_pool_name: {get_param: CinderRbdPoolName}
             tripleo::profile::base::cinder::volume::rbd::cinder_rbd_user_name: {get_param: CephClientUserName}
             tripleo.cinder_volume.firewall_rules:
-- 
cgit 1.2.3-korg