summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCody A.W. Somerville <cody.somerville@hp.com>2013-05-16 18:25:55 -0400
committerClint Byrum <clint@fewbar.com>2013-06-06 09:37:05 -0700
commit5f763d6efb34b581dc6f791fb0bda1fd262da863 (patch)
tree0f7c6c598f76671750a15ea9b40c845b38c318f2
parent1536112575cb05d38ed17d5fd5a556f10fb7d371 (diff)
Fixed the nova-compute template.
-rw-r--r--nova-compute.yaml12
1 files changed, 8 insertions, 4 deletions
diff --git a/nova-compute.yaml b/nova-compute.yaml
index ad7446f0..172e9a1a 100644
--- a/nova-compute.yaml
+++ b/nova-compute.yaml
@@ -8,7 +8,7 @@ Parameters:
InstanceType:
Description: Use this flavor
Type: String
- Default: bm.small
+ Default: baremetal
NovaImage:
Type: String
KeystoneHost:
@@ -16,6 +16,8 @@ Parameters:
ServicePassword:
Description: admin_password for setting up auth in nova.
Type: String
+ QuantumHost:
+ Type: String
RabbitHost:
Type: String
RabbitPassword:
@@ -24,7 +26,7 @@ Parameters:
Type: String
Default: eth0
NovaComputeSize:
- Type: Integer
+ Type: Number
Default: 1
NovaComputeDriver:
Type: String
@@ -78,8 +80,10 @@ Resources:
store_key: ''
interfaces:
control: {Ref: NovaInterfaces}
- NovaCompute:
+ NovaCompute:
Type: OS::Heat::InstanceGroup
Properties:
- LaunchConfiguration: {Ref: NovaLaunch}
+ LaunchConfigurationName: {Ref: NovaLaunch}
Size: {Ref: NovaComputeSize}
+ AvailabilityZones:
+ Fn::GetAZs: ''