aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Nemec <bnemec@redhat.com>2014-03-05 17:51:25 -0600
committerBen Nemec <bnemec@redhat.com>2014-03-31 19:54:18 -0500
commit2f50006b5bdf0d2f84f806e9d9c7f0dc5ab656e6 (patch)
treee04639968611e7155ed79658cfe636258237672c
parent06b199e889e86c120aa270c95db09adf349b2213 (diff)
Allow setting the cinder iscsi-helper option
This is necessary to support iscsi helpers other than tgtadm, such as lioadm. Change-Id: I8a63872185f73372fcf6c90d3dde31e5bb0a168b
-rw-r--r--block-storage.yaml2
-rw-r--r--overcloud-source.yaml6
2 files changed, 8 insertions, 0 deletions
diff --git a/block-storage.yaml b/block-storage.yaml
index 453a0ac7..fb6261ce 100644
--- 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 bba161e1..88322be3 100644
--- 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: