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

diff --git a/block-storage-nfs.yaml b/block-storage-nfs.yaml
index 04f45ef..d2d5af2 100644 (file)
--- 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 8508e1f..622c19f 100644 (file)
--- 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]} ]} ] }