Stabilize perf tests

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

diff --git a/openstack-hot/csit-apex-3-instance-type.yaml b/openstack-hot/csit-apex-3-instance-type.yaml
index 331919f66ef4fe043252e57742d2039a32d97903..69010321d3020efb6ba2952efb996a3f27813ee0 100644 (file)
--- a/openstack-hot/csit-apex-3-instance-type.yaml
+++ b/openstack-hot/csit-apex-3-instance-type.yaml
@@ -37,77 +37,79 @@ parameters:
         description: Flavor to run instance on for 3rd VM type
     vm_2_image:
         type: string
+        description: Image to run instance on for 3rd VM type
 
 resources:
-
     192_network:
         type: OS::Neutron::Net
         properties:
-            name: APEX_192_network
+            name:
+                str_replace:
+                    template: SILO-JOB_NAME-NET
+                    params:
+                        "SILO": {get_param: silo}
+                        "JOB_NAME": {get_param: job_name}
+                        "NET": 'APEX_192_network'
             port_security_enabled: false
 
     192_subnet:
         type: OS::Neutron::Subnet
         properties:
+            name:
+                str_replace:
+                    template: SILO-JOB_NAME-SUBNET
+                    params:
+                        "SILO": {get_param: silo}
+                        "JOB_NAME": {get_param: job_name}
+                        "SUBNET": 'APEX_192_subnet'
             network_id: {get_resource: 192_network}
             cidr: 192.0.2.0/24
             gateway_ip: 192.0.2.1
             allocation_pools:
-                - start: 192.0.2.2
-                  end: 192.0.2.50
+                - start: 192.0.2.51
+                  end: 192.0.2.99
 
     vm_0_group:
         type: "OS::Heat::ResourceGroup"
         properties:
             count: {get_param: vm_0_count}
             resource_def:
-                type: generic-server.yaml
+                type: apex-server.yaml
                 properties:
                     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_network: {get_resource: 192_network}
 
     vm_1_group:
         type: "OS::Heat::ResourceGroup"
         properties:
             count: {get_param: vm_1_count}
             resource_def:
-                type: generic-server.yaml
+                type: apex-server.yaml
                 properties:
                     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_network: {get_resource: 192_network}
 
     vm_2_group:
         type: "OS::Heat::ResourceGroup"
         properties:
             count: {get_param: vm_2_count}
             resource_def:
-                type: generic-server.yaml
+                type: apex-server.yaml
                 properties:
                     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}
-
-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_network: {get_resource: 192_network}