aboutsummaryrefslogtreecommitdiffstats
path: root/block-storage.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-04-08 00:09:14 +0000
committerGerrit Code Review <review@openstack.org>2014-04-08 00:09:14 +0000
commit15bbf5cc26400c0012d4cc9a89dba92c0e50415a (patch)
treef0d68aa28af7d9058b7092976c45fb41ec909f7a /block-storage.yaml
parent36b3d9edf5fecfaa592c52c41b14f3663847214a (diff)
parent2f50006b5bdf0d2f84f806e9d9c7f0dc5ab656e6 (diff)
Merge "Allow setting the cinder iscsi-helper option"
Diffstat (limited to 'block-storage.yaml')
-rw-r--r--block-storage.yaml2
1 files changed, 2 insertions, 0 deletions
diff --git a/block-storage.yaml b/block-storage.yaml
index e651b4ff..312ce95b 100644
--- a/block-storage.yaml
+++ b/block-storage.yaml
@@ -80,6 +80,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]} ]} ] }