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

diff --git a/block-storage.yaml b/block-storage.yaml
index d7548c9..9959bdb 100644 (file)
--- 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}