From: Clint Byrum <clint@fewbar.com>
Date: Fri, 13 Sep 2013 15:59:37 +0000 (-0700)
Subject: Use native resource for nova-compute-instance
X-Git-Tag: opnfv-6.0.0~2959
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=89ddd6fd934236c18b66c42b7a42681438e30258;p=apex-tripleo-heat-templates.git

Use native resource for nova-compute-instance

Change-Id: I347465b32578467ca3d9f55ea2994d832fcd8b3f
---

diff --git a/nova-compute-instance.yaml b/nova-compute-instance.yaml
index a3fef086..3a29f011 100644
--- a/nova-compute-instance.yaml
+++ b/nova-compute-instance.yaml
@@ -5,7 +5,7 @@ Parameters:
     Description: Name of an existing EC2 KeyPair to enable SSH access to the instances
     Type: String
     Default: default
-  InstanceType:
+  Flavor:
     Description: Use this flavor
     Type: String
     Default: baremetal
@@ -63,12 +63,12 @@ Resources:
       UserName:
         Ref: ComputeUser
   NovaCompute0:
-    Type: AWS::EC2::Instance
+    Type: OS::Nova::Server
     Properties:
-      ImageId:
+      image:
         {Ref: NovaImage}
-      InstanceType: {Ref: InstanceType}
-      KeyName: {Ref: KeyName}
+      flavor: {Ref: Flavor}
+      key_name: {Ref: KeyName}
     Metadata:
       os-collect-config:
         cfn: