X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=openstack-hot%2Fgeneric-server.yaml;h=dab55a34e1fc3a2c6c9fb24dc5ec1b73517c57b9;hb=adf066a0a9e6202a0728ffb17222c316376df095;hp=1c75c81a01c3547735d6fc26162c5b6efb7e8e30;hpb=8f6fca564dc9f568f9e553b993b8dfb61d2f9653;p=releng%2Fbuilder.git

diff --git a/openstack-hot/generic-server.yaml b/openstack-hot/generic-server.yaml
index 1c75c81a0..dab55a34e 100644
--- a/openstack-hot/generic-server.yaml
+++ b/openstack-hot/generic-server.yaml
@@ -1,17 +1,32 @@
+---
 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
+
+            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.
     ssh_key:
         type: string
         description: SSH Key name to use (Public key must exist in OpenStack)
     index:
         type: number
+    group:
+        type: number
+        default: "0"
     vm_flavor:
         type: string
-        default: 1 GB General Purpose v1
+        default: v1-standard-1
         description: OpenStack Flavor to use
     vm_image:
         type: string
@@ -21,28 +36,37 @@ resources:
     instance:
         type: "OS::Nova::Server"
         properties:
-            flavor: { get_param: vm_flavor }
-            image: { get_param: vm_image }
+            flavor: {get_param: vm_flavor}
+            block_device_mapping_v2:
+                - image: {get_param: vm_image}
+                  delete_on_termination: true
+                  volume_size: 40
             name:
                 str_replace:
-                    template: JOB_NAME-VM_TYPE-INDEX
+                    template: SILO-JOB_NAME-GROUP-VM_TYPE-INDEX
                     params:
-                        "JOB_NAME": { get_param: job_name }
+                        "SILO": {get_param: silo}
+                        "JOB_NAME": {get_param: job_name}
                         "VM_TYPE":
                             str_split:
                                 - ' - '
-                                - { get_param: vm_image }
-                                - 1
-                        "INDEX": { get_param: index }
+                                - {get_param: vm_image}
+                                - 2
+                        "GROUP": {get_param: group}
+                        "INDEX": {get_param: index}
             networks:
-                - network: RC-ODL
-            key_name: { get_param: ssh_key }
+                - network: odlci
+            key_name: {get_param: ssh_key}
             user_data: |
                 #!/bin/bash
+                until host git.opendaylight.org &>/dev/null
+                do
+                    echo "Waiting until git.opendaylight.org is resolvable..."
+                done
                 git clone https://git.opendaylight.org/gerrit/releng/builder /builder
                 /builder/jenkins-scripts/jenkins-init-script.sh
 
 outputs:
     ip:
         description: IP address of the instance
-        value: { get_attr: [instance, networks, RC-ODL, 0] }
+        value: {get_attr: [instance, networks, odlci, 0]}