Merge "Update cloud image Ubuntu18.04 mininet ovs"

[releng/builder.git] / openstack-hot / csit-2-instance-type.yaml

diff --git a/openstack-hot/csit-2-instance-type.yaml b/openstack-hot/csit-2-instance-type.yaml
index a70be2101b221e951fd7a5270e6010d56c87bd1e..e1080473163f2d6ff0ecf81d06415412df6bde09 100644 (file)
--- a/openstack-hot/csit-2-instance-type.yaml
+++ b/openstack-hot/csit-2-instance-type.yaml
@@ -1,66 +1,69 @@
+---
 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
+  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
 
 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 }
 
 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_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] }