From 948fc78c9b199ac429842fd038957b5c197458ed Mon Sep 17 00:00:00 2001 From: Ryan Brady Date: Fri, 14 Mar 2014 11:03:02 -0400 Subject: 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 --- block-storage-nfs.yaml | 1 - block-storage.yaml | 1 - 2 files changed, 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]} ]} ] } -- cgit 1.2.3-korg