Remove unused views

[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 056c6901830e127db038271f21b2a8e4966019c7..c813ceeea4f2c0d7d586da6efc89e4e5bba33111 100644 (file)
--- a/openstack-hot/csit-2-instance-type.yaml
+++ b/openstack-hot/csit-2-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,33 +33,37 @@ 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 }
-                    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 }
-                    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}
 
 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]}