aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyan Brady <rbrady@redhat.com>2014-03-14 11:03:02 -0400
committerRyan Brady <rbrady@redhat.com>2014-03-14 11:03:02 -0400
commit948fc78c9b199ac429842fd038957b5c197458ed (patch)
tree6875c83f341923936119b6195e4e397cb276a3ca
parent0490dd665899d3265a72965aeaf3a342275f4328 (diff)
Remove unnecessary cinder metadata
Previously all cinder functionality was in a single element and required "volume: 'true'" to install the cinder-volume service. Now cinder has been split into multiple elements and you build an image with the cinder-volume element to achieve the same goal. This patch removes the "volume: 'true'". Change-Id: I2ed2e6f7c7db7619aee7ce4ba730f310344e0b0e
-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 04f45ef4..d2d5af22 100644
--- a/block-storage-nfs.yaml
+++ b/block-storage-nfs.yaml
@@ -46,7 +46,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 8508e1f1..622c19ff 100644
--- a/block-storage.yaml
+++ b/block-storage.yaml
@@ -46,7 +46,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]} ]} ] }