From: Clint Byrum <clint@fewbar.com>
Date: Fri, 13 Sep 2013 16:03:46 +0000 (-0700)
Subject: Use native server resource in overcloud
X-Git-Tag: opnfv-6.0.0~2958
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=8c12b7162324e04ebd83aa2e57eb05502caae471;p=apex-tripleo-heat-templates.git

Use native server resource in overcloud

Change-Id: I4745627508e8b6b687fc17527cdd3c41d09b0d80
---

diff --git a/overcloud-source.yaml b/overcloud-source.yaml
index 0c1a5b15..393e2c32 100644
--- a/overcloud-source.yaml
+++ b/overcloud-source.yaml
@@ -10,7 +10,7 @@ Parameters:
     Default: unset
     Description: The keystone auth secret.
     Type: String
-  InstanceType:
+  Flavor:
     Default: baremetal
     Description: Flavor to request when deploying.
     Type: String
@@ -209,13 +209,13 @@ Resources:
         password: guest
       service-password: unset
   notcompute:
-    Type: AWS::EC2::Instance
+    Type: OS::Nova::Server
     Properties:
-      ImageId:
+      image:
         Ref: notcomputeImage
-      InstanceType:
-        Ref: InstanceType
-      KeyName:
+      flavor:
+        Ref: Flavor
+      key_name:
         Ref: KeyName
     Metadata:
       os-collect-config: