Remove unused views

[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 f91fc8664aa9cd4c74bef07dae349a79b2e25d1b..69010321d3020efb6ba2952efb996a3f27813ee0 100644 (file)
--- a/openstack-hot/csit-apex-3-instance-type.yaml
+++ b/openstack-hot/csit-apex-3-instance-type.yaml
@@ -37,25 +37,37 @@ 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: APEX_192_subnet
+            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"
@@ -70,6 +82,7 @@ resources:
                     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"
@@ -84,6 +97,7 @@ resources:
                     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"
@@ -98,3 +112,4 @@ resources:
                     group: "2"
                     vm_flavor: {get_param: vm_2_flavor}
                     vm_image: {get_param: vm_2_image}
+                    vm_network: {get_resource: 192_network}