summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-03-26 09:38:58 +0000
committerGerrit Code Review <review@openstack.org>2014-03-26 09:38:58 +0000
commit06b199e889e86c120aa270c95db09adf349b2213 (patch)
tree5ca8388c382c39503a5140b2a75c71d20899d9db
parente5aa2ec94a52b21cef5e0151406e2505c353344f (diff)
parent948fc78c9b199ac429842fd038957b5c197458ed (diff)
Merge "Remove unnecessary cinder metadata"
-rw-r--r--block-storage-nfs.yaml1
-rw-r--r--block-storage.yaml1
2 files changed, 0 insertions, 2 deletions
diff --git a/block-storage-nfs.yaml b/block-storage-nfs.yaml
index eabe983a..d00484b9 100644
--- a/block-storage-nfs.yaml
+++ b/block-storage-nfs.yaml
@@ -57,7 +57,6 @@ Resources:
volume_size_mb: '5000'
service-password:
Ref: CinderPassword
- volume: 'true'
include_nfs_backend: 'true'
nfs_shares:
- {"Fn::Join": ['', [{"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notCompute0, networks]} ]} ] } , ':/mnt/state/var/lib/nfs_share']]}
diff --git a/block-storage.yaml b/block-storage.yaml
index 507ca631..453a0ac7 100644
--- a/block-storage.yaml
+++ b/block-storage.yaml
@@ -57,7 +57,6 @@ Resources:
volume_size_mb: '5000'
service-password:
Ref: CinderPassword
- volume: 'true'
admin-password: {Ref: AdminPassword}
rabbit:
host: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notCompute0, networks]} ]} ] }