X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=openstack-hot%2Fcsit-4-instance-type.yaml;h=33e16c6a699ed6b87872f949cc4dd3185d918d47;hb=6737d651d0b72d9f2a4a127bee152da831d0a917;hp=79de0db5afe712b8b25cf1ee8db61bc46f0d03e2;hpb=8d2f7df3cdb581f4d69c6617177d40537ab9fb0b;p=releng%2Fbuilder.git

diff --git a/openstack-hot/csit-4-instance-type.yaml b/openstack-hot/csit-4-instance-type.yaml
index 79de0db5a..33e16c6a6 100644
--- a/openstack-hot/csit-4-instance-type.yaml
+++ b/openstack-hot/csit-4-instance-type.yaml
@@ -2,117 +2,121 @@
 heat_template_version: 2016-04-08
 
 parameters:
-    job_name:
-        type: string
-        description: Name of job running this template
-    silo:
-        type: string
-        description: Jenkins Silo job is running in (typically releng|sandbox)
-    vm_0_count:
-        type: number
-        description: Number of VMs for 1st VM type
-    vm_0_flavor:
-        type: string
-        default: 1 GB General Purpose v1
-        description: Flavor to run instance on for 1st VM type
-    vm_0_image:
-        type: string
-        description: Image to run instance on for 1st VM type
-    vm_1_count:
-        type: number
-        description: Number of VMs for 2nd VM type
-    vm_1_flavor:
-        type: string
-        default: 1 GB General Purpose v1
-        description: Flavor to run instance on for 2nd VM type
-    vm_1_image:
-        type: string
-        description: Image to run instance on for 2nd VM type
-    vm_2_count:
-        type: number
-        description: Number of VMs for 3rd VM type
-    vm_2_flavor:
-        type: string
-        default: 1 GB General Purpose v1
-        description: Flavor to run instance on for 3rd VM type
-    vm_2_image:
-        type: string
-    vm_3_count:
-        type: number
-        description: Number of VMs for 3rd VM type
-    vm_3_flavor:
-        type: string
-        default: 1 GB General Purpose v1
-        description: Flavor to run instance on for 3rd VM type
-    vm_3_image:
-        type: string
+  job_name:
+    type: string
+    description: Name of job running this template
+  silo:
+    type: string
+    description: Jenkins Silo job is running in (typically releng|sandbox)
+  vm_0_count:
+    type: number
+    description: Number of VMs for 1st VM type
+  vm_0_flavor:
+    type: string
+    default: v3-standard-2
+    description: Flavor to run instance on for 1st VM type
+  vm_0_image:
+    type: string
+    description: Image to run instance on for 1st VM type
+  vm_1_count:
+    type: number
+    description: Number of VMs for 2nd VM type
+  vm_1_flavor:
+    type: string
+    default: v3-standard-2
+    description: Flavor to run instance on for 2nd VM type
+  vm_1_image:
+    type: string
+    description: Image to run instance on for 2nd VM type
+  vm_2_count:
+    type: number
+    description: Number of VMs for 3rd VM type
+  vm_2_flavor:
+    type: string
+    default: v3-standard-2
+    description: Flavor to run instance on for 3rd VM type
+  vm_2_image:
+    type: string
+  vm_3_count:
+    type: number
+    description: Number of VMs for 3rd VM type
+  vm_3_flavor:
+    type: string
+    default: v3-standard-2
+    description: Flavor to run instance on for 3rd VM type
+  vm_3_image:
+    type: string
 
 resources:
-    vm_0_group:
-        type: "OS::Heat::ResourceGroup"
+  vm_0_group:
+    type: "OS::Heat::ResourceGroup"
+    properties:
+      count: { get_param: vm_0_count }
+      resource_def:
+        type: generic-server.yaml
         properties:
-            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}
-                    index: "%index%"
-                    vm_flavor: {get_param: vm_0_flavor}
-                    vm_image: {get_param: vm_0_image}
+          job_name: { get_param: job_name }
+          silo: { get_param: silo }
+          ssh_key: { get_param: silo }
+          index: "%index%"
+          group: "0"
+          vm_flavor: { get_param: vm_0_flavor }
+          vm_image: { get_param: vm_0_image }
 
-    vm_1_group:
-        type: "OS::Heat::ResourceGroup"
+  vm_1_group:
+    type: "OS::Heat::ResourceGroup"
+    properties:
+      count: { get_param: vm_1_count }
+      resource_def:
+        type: generic-server.yaml
         properties:
-            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}
-                    index: "%index%"
-                    vm_flavor: {get_param: vm_1_flavor}
-                    vm_image: {get_param: vm_1_image}
+          job_name: { get_param: job_name }
+          silo: { get_param: silo }
+          ssh_key: { get_param: silo }
+          index: "%index%"
+          group: "1"
+          vm_flavor: { get_param: vm_1_flavor }
+          vm_image: { get_param: vm_1_image }
 
-    vm_2_group:
-        type: "OS::Heat::ResourceGroup"
+  vm_2_group:
+    type: "OS::Heat::ResourceGroup"
+    properties:
+      count: { get_param: vm_2_count }
+      resource_def:
+        type: generic-server.yaml
         properties:
-            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}
-                    index: "%index%"
-                    vm_flavor: {get_param: vm_2_flavor}
-                    vm_image: {get_param: vm_2_image}
-    vm_3_group:
-        type: "OS::Heat::ResourceGroup"
+          job_name: { get_param: job_name }
+          silo: { get_param: silo }
+          ssh_key: { get_param: silo }
+          index: "%index%"
+          group: "2"
+          vm_flavor: { get_param: vm_2_flavor }
+          vm_image: { get_param: vm_2_image }
+  vm_3_group:
+    type: "OS::Heat::ResourceGroup"
+    properties:
+      count: { get_param: vm_3_count }
+      resource_def:
+        type: generic-server.yaml
         properties:
-            count: {get_param: vm_3_count}
-            resource_def:
-                type: generic-server.yaml
-                properties:
-                    job_name: {get_param: job_name}
-                    silo: {get_param: silo}
-                    ssh_key: {get_param: silo}
-                    index: "%index%"
-                    vm_flavor: {get_param: vm_3_flavor}
-                    vm_image: {get_param: vm_3_image}
+          job_name: { get_param: job_name }
+          silo: { get_param: silo }
+          ssh_key: { get_param: silo }
+          index: "%index%"
+          group: "3"
+          vm_flavor: { get_param: vm_3_flavor }
+          vm_image: { get_param: vm_3_image }
 
 outputs:
-    vm_0_ips:
-        description: IP addresses of the 1st vm types
-        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]}
-    vm_2_ips:
-        description: IP addresses of the 3rd vm types
-        value: {get_attr: [vm_2_group, ip]}
-    vm_3_ips:
-        description: IP addresses of the 4th vm types
-        value: {get_attr: [vm_3_group, ip]}
+  vm_0_ips:
+    description: IP addresses of the 1st vm types
+    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] }
+  vm_2_ips:
+    description: IP addresses of the 3rd vm types
+    value: { get_attr: [vm_2_group, ip] }
+  vm_3_ips:
+    description: IP addresses of the 4th vm types
+    value: { get_attr: [vm_3_group, ip] }