Fixed the nova-compute template.
authorCody A.W. Somerville <cody.somerville@hp.com>
Thu, 16 May 2013 22:25:55 +0000 (18:25 -0400)
committerClint Byrum <clint@fewbar.com>
Thu, 6 Jun 2013 16:37:05 +0000 (09:37 -0700)
nova-compute.yaml

index ad7446f..172e9a1 100644 (file)
@@ -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: ''