X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=openstack-hot%2Fcsit-3-instance-type.yaml;h=de6548a3406e1838b0a69149ca0418e1b5798c70;hb=769e949ea29cfa694c52df91e77beb0863972e29;hp=3aadcf9f79e9b8491c7e31bd85b4ec8ac121bdef;hpb=909d01215f4ec193d3552d823147f978a2c851ef;p=releng%2Fbuilder.git

diff --git a/openstack-hot/csit-3-instance-type.yaml b/openstack-hot/csit-3-instance-type.yaml
index 3aadcf9f7..de6548a34 100644
--- a/openstack-hot/csit-3-instance-type.yaml
+++ b/openstack-hot/csit-3-instance-type.yaml
@@ -1,3 +1,4 @@
+---
 heat_template_version: 2016-04-08
 
 parameters:
@@ -12,7 +13,7 @@ parameters:
         description: Number of VMs for 1st VM type
     vm_0_flavor:
         type: string
-        default: 1 GB General Purpose v1
+        default: v1-standard-1
         description: Flavor to run instance on for 1st VM type
     vm_0_image:
         type: string
@@ -22,7 +23,7 @@ parameters:
         description: Number of VMs for 2nd VM type
     vm_1_flavor:
         type: string
-        default: 1 GB General Purpose v1
+        default: v1-standard-1
         description: Flavor to run instance on for 2nd VM type
     vm_1_image:
         type: string
@@ -32,7 +33,7 @@ parameters:
         description: Number of VMs for 3rd VM type
     vm_2_flavor:
         type: string
-        default: 1 GB General Purpose v1
+        default: v1-standard-1
         description: Flavor to run instance on for 3rd VM type
     vm_2_image:
         type: string
@@ -41,52 +42,55 @@ resources:
     vm_0_group:
         type: "OS::Heat::ResourceGroup"
         properties:
-            count: { get_param: vm_0_count }
+            count: {get_param: vm_0_count}
             resource_def:
                 type: generic-server.yaml
                 properties:
-                    job_name: { get_param: job_name }
-                    silo: { get_param: silo }
-                    ssh_key: { get_param: silo }
+                    job_name: {get_param: job_name}
+                    silo: {get_param: silo}
+                    ssh_key: {get_param: silo}
                     index: "%index%"
-                    vm_flavor: { get_param: vm_0_flavor }
-                    vm_image: { get_param: vm_0_image }
+                    group: "0"
+                    vm_flavor: {get_param: vm_0_flavor}
+                    vm_image: {get_param: vm_0_image}
 
     vm_1_group:
         type: "OS::Heat::ResourceGroup"
         properties:
-            count: { get_param: vm_1_count }
+            count: {get_param: vm_1_count}
             resource_def:
                 type: generic-server.yaml
                 properties:
-                    job_name: { get_param: job_name }
-                    silo: { get_param: silo }
-                    ssh_key: { get_param: silo }
+                    job_name: {get_param: job_name}
+                    silo: {get_param: silo}
+                    ssh_key: {get_param: silo}
                     index: "%index%"
-                    vm_flavor: { get_param: vm_1_flavor }
-                    vm_image: { get_param: vm_1_image }
+                    group: "1"
+                    vm_flavor: {get_param: vm_1_flavor}
+                    vm_image: {get_param: vm_1_image}
 
     vm_2_group:
         type: "OS::Heat::ResourceGroup"
         properties:
-            count: { get_param: vm_2_count }
+            count: {get_param: vm_2_count}
             resource_def:
                 type: generic-server.yaml
                 properties:
-                    job_name: { get_param: job_name }
-                    silo: { get_param: silo }
-                    ssh_key: { get_param: silo }
+                    job_name: {get_param: job_name}
+                    silo: {get_param: silo}
+                    ssh_key: {get_param: silo}
                     index: "%index%"
-                    vm_flavor: { get_param: vm_2_flavor }
-                    vm_image: { get_param: vm_2_image }
+                    group: "2"
+                    vm_flavor: {get_param: vm_2_flavor}
+                    vm_image: {get_param: vm_2_image}
 
 outputs:
     vm_0_ips:
         description: IP addresses of the 1st vm types
-        value: { get_attr: [vm_0_group, ip] }
+        value: {get_attr: [vm_0_group, ip]}
     vm_1_ips:
         description: IP addresses of the 2nd vm types
-        value: { get_attr: [vm_1_group, ip] }
+        value: {get_attr: [vm_1_group, ip]}
     vm_2_ips:
         description: IP addresses of the 3rd vm types
-        value: { get_attr: [vm_2_group, ip] }
+        value: {get_attr: [vm_2_group, ip]}