Allow setting the cinder iscsi-helper option

This is necessary to support iscsi helpers other than tgtadm, such
as lioadm.

Change-Id: I8a63872185f73372fcf6c90d3dde31e5bb0a168b

diff --git a/block-storage.yaml b/block-storage.yaml
index 453a0ac..fb6261c 100644 (file)
--- a/block-storage.yaml
+++ b/block-storage.yaml
@@ -57,6 +57,8 @@ Resources:
         volume_size_mb: '5000'
         service-password:
           Ref: CinderPassword
+        iscsi-helper:
+          Ref: CinderISCSIHelper
       admin-password: {Ref: AdminPassword}
       rabbit:
         host: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notCompute0, networks]} ]} ] }

diff --git a/overcloud-source.yaml b/overcloud-source.yaml
index bba161e..88322be 100644 (file)
--- a/overcloud-source.yaml
+++ b/overcloud-source.yaml
@@ -17,6 +17,10 @@ Parameters:
     Description: The password for the cinder service account, used by cinder-api.
     Type: String
     NoEcho: true
+  CinderISCSIHelper:
+    Default: tgtadm
+    Description: The iSCSI helper to use with cinder.
+    Type: String
   OvercloudControlFlavor:
     Default: baremetal
     Description: Flavor for control nodes to request when deploying.
@@ -314,6 +318,8 @@ Resources:
         volume_size_mb: '5000'
         service-password:
           Ref: CinderPassword
+        iscsi-helper:
+          Ref: CinderISCSIHelper
       completion-handle:
         Ref: notCompute0CompletionHandle
       controller-address: