aboutsummaryrefslogtreecommitdiffstats
path: root/nova-compute-instance.yaml
diff options
context:
space:
mode:
authorClint Byrum <clint@fewbar.com>2013-09-13 08:59:37 -0700
committerClint Byrum <clint@fewbar.com>2013-09-13 09:08:53 -0700
commit89ddd6fd934236c18b66c42b7a42681438e30258 (patch)
treeceb2960fbe44cc579dd958cfbca447c2c8e9db7e /nova-compute-instance.yaml
parentfae091e5c37e430bb249143e3938af5647124024 (diff)
Use native resource for nova-compute-instance
Change-Id: I347465b32578467ca3d9f55ea2994d832fcd8b3f
Diffstat (limited to 'nova-compute-instance.yaml')
-rw-r--r--nova-compute-instance.yaml10
1 files changed, 5 insertions, 5 deletions
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: