Update cloud image

[releng/builder.git] / openstack-hot / apex-server.yaml

diff --git a/openstack-hot/apex-server.yaml b/openstack-hot/apex-server.yaml
index 0b7b86cd33fd64bcfda57c718e67d36c04ca7986..98049274795b0e36d9b7339c1ca1f71e7694560e 100644 (file)
--- a/openstack-hot/apex-server.yaml
+++ b/openstack-hot/apex-server.yaml
@@ -2,57 +2,54 @@
 heat_template_version: 2016-04-08
 
 parameters:
-    job_name:
-        type: string
-        description: Name of job running this template
-    silo:
-        type: string
-        default: vm
-        description: |
-            String to identify a Jenkins Master
+  job_name:
+    type: string
+    description: Name of job running this template
+  silo:
+    type: string
+    default: vm
+    description: |
+      String to identify a Jenkins Master
 
-            Useful in scenarios where multiple Jenkins Masters might be
-            creating VMs in the same cloud to uniquely distinguish them.
+      Useful in scenarios where multiple Jenkins Masters might be
+      creating VMs in the same cloud to uniquely distinguish them.
 
-            TODO we should move to using tags once OpenStack Ocata which is
-            available to us with support for server tags properties.
-    index:
-        type: number
-    group:
-        type: number
-        default: "0"
-    vm_flavor:
-        type: string
-        default: v1-standard-4
-        description: OpenStack Flavor to use
-    vm_image:
-        type: string
-        description: VM Image to spin up
+      TODO we should move to using tags once OpenStack Ocata which is
+      available to us with support for server tags properties.
+  index:
+    type: number
+  group:
+    type: number
+    default: "0"
+  vm_flavor:
+    type: string
+    default: v1-standard-4
+    description: OpenStack Flavor to use
+  vm_image:
+    type: string
+    description: VM Image to spin up
+  vm_network:
+    type: string
+    description: VM network
 
 resources:
-    port:
-        type: "OS::Neutron::Port"
-        properties:
-            allowed_address_pairs:
-                - ip_address: 192.0.2.0/24
-            network: APEX_192_network
-    instance:
-        type: "OS::Nova::Server"
-        properties:
-            image: {get_param: vm_image}
-            flavor: {get_param: vm_flavor}
-            name:
-                str_replace:
-                    template: SILO-JOB_NAME-GROUP-VM_TYPE-INDEX
-                    params:
-                        "SILO": {get_param: silo}
-                        "JOB_NAME": {get_param: job_name}
-                        "VM_TYPE":
-                            str_split:
-                                - ' - '
-                                - {get_param: vm_image}
-                                - 2
-                        "GROUP": {get_param: group}
-                        "INDEX": {get_param: index}
-            networks:
-                - port: {get_resource: port}
+  instance:
+    type: "OS::Nova::Server"
+    properties:
+      image: { get_param: vm_image }
+      flavor: { get_param: vm_flavor }
+      name:
+        str_replace:
+          template: SILO-JOB_NAME-GROUP-VM_TYPE-INDEX
+          params:
+            "SILO": { get_param: silo }
+            "JOB_NAME": { get_param: job_name }
+            "VM_TYPE":
+              str_split:
+                - " - "
+                - { get_param: vm_image }
+                - 2
+            "GROUP": { get_param: group }
+            "INDEX": { get_param: index }
+      networks:
+        - network: { get_param: vm_network }