diff options
| author |   marios <marios@redhat.com> | 2014-01-28 16:38:52 +0200 |
|---|---|---|
| committer | marios <marios@redhat.com> | 2014-01-28 16:49:58 +0200 |
| commit | 4f423ed6aec34a2f4274cd48d20dccb6080f6068 (patch) | |
| tree | 34fde0f874cbcee064b242eb61aa7708b5b98670 /block-storage.yaml | |
| parent | 1d591672fb8dcb4afed8fac2910956348005a43e (diff) | |
Remove InstanceType and ImageId from cinder template
InstanceType and ImageId properties belong to an
AWS::AutoScaling::LaunchConfiguration, for example as used for
NovaCompute0Config in nova-compute-instance.yaml. However this
template doesn't use a LaunchConfig but params instead. AFAICT
we don't need these here (and they cause HEAT template validation
to fail)
Change-Id: If444e4449e3d62cb954de48bc3b55b16dcc8886f
Diffstat (limited to 'block-storage.yaml')
| -rw-r--r-- | block-storage.yaml | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/block-storage.yaml b/block-storage.yaml index d7548c9c..9959bdbc 100644 --- a/block-storage.yaml +++ b/block-storage.yaml @@ -39,8 +39,6 @@ Resources: {Ref: BlockStorageImage} flavor: {Ref: Flavor} key_name: {Ref: KeyName} - InstanceType: '0' - ImageId: '0' Metadata: os-collect-config: cfn: @@ -63,4 +61,4 @@ Resources: host: {Ref: RabbitHost} password: {Ref: RabbitPassword} interfaces: - control: {Ref: NeutronPublicInterface}
\ No newline at end of file + control: {Ref: NeutronPublicInterface} |