Restore robot vms to 2c

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

diff --git a/openstack-hot/generic-server.yaml b/openstack-hot/generic-server.yaml
index dab55a34e1fc3a2c6c9fb24dc5ec1b73517c57b9..81b102cb7100d69f242864eb601a3d2359578561 100644 (file)
--- a/openstack-hot/generic-server.yaml
+++ b/openstack-hot/generic-server.yaml
@@ -33,14 +33,17 @@ parameters:
         description: VM Image to spin up
 
 resources:
+    volume:
+        type: "OS::Cinder::Volume"
+        properties:
+            image: {get_param: vm_image}
+            size: 40
     instance:
         type: "OS::Nova::Server"
         properties:
             flavor: {get_param: vm_flavor}
             block_device_mapping_v2:
-                - image: {get_param: vm_image}
-                  delete_on_termination: true
-                  volume_size: 40
+                - volume_id: {get_resource: volume}
             name:
                 str_replace:
                     template: SILO-JOB_NAME-GROUP-VM_TYPE-INDEX
@@ -59,11 +62,11 @@ resources:
             key_name: {get_param: ssh_key}
             user_data: |
                 #!/bin/bash
-                until host git.opendaylight.org &>/dev/null
+                until host devvexx.opendaylight.org &>/dev/null
                 do
-                    echo "Waiting until git.opendaylight.org is resolvable..."
+                    echo "Waiting until devvexx.opendaylight.org is resolvable..."
                 done
-                git clone https://git.opendaylight.org/gerrit/releng/builder /builder
+                git clone git://devvexx.opendaylight.org/mirror/releng/builder /builder
                 /builder/jenkins-scripts/jenkins-init-script.sh
 
 outputs: