X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=openstack-hot%2Fgeneric-server.yaml;h=68fe7493778f50627c539f2f7bac7730d5df7ee5;hb=e8b2405868e9f11673d0a6399c5ff23ac15438ef;hp=81b102cb7100d69f242864eb601a3d2359578561;hpb=f9913c593c902def3683edf75781309eb5b6267c;p=releng%2Fbuilder.git

diff --git a/openstack-hot/generic-server.yaml b/openstack-hot/generic-server.yaml
index 81b102cb7..68fe74937 100644
--- a/openstack-hot/generic-server.yaml
+++ b/openstack-hot/generic-server.yaml
@@ -33,17 +33,17 @@ parameters:
         description: VM Image to spin up
 
 resources:
-    volume:
-        type: "OS::Cinder::Volume"
+    port:
+        type: "OS::Neutron::Port"
         properties:
-            image: {get_param: vm_image}
-            size: 40
+            allowed_address_pairs:
+                - ip_address: 10.250.0.0/24
+            network: odlci
     instance:
         type: "OS::Nova::Server"
         properties:
+            image: {get_param: vm_image}
             flavor: {get_param: vm_flavor}
-            block_device_mapping_v2:
-                - volume_id: {get_resource: volume}
             name:
                 str_replace:
                     template: SILO-JOB_NAME-GROUP-VM_TYPE-INDEX
@@ -58,7 +58,7 @@ resources:
                         "GROUP": {get_param: group}
                         "INDEX": {get_param: index}
             networks:
-                - network: odlci
+                - port: {get_resource: port}
             key_name: {get_param: ssh_key}
             user_data: |
                 #!/bin/bash
@@ -66,8 +66,8 @@ resources:
                 do
                     echo "Waiting until devvexx.opendaylight.org is resolvable..."
                 done
-                git clone git://devvexx.opendaylight.org/mirror/releng/builder /builder
-                /builder/jenkins-scripts/jenkins-init-script.sh
+                git clone --recurse-submodules git://devvexx.opendaylight.org/mirror/releng/builder /opt/ciman
+                /opt/ciman/jjb/global-jjb/jenkins-init-scripts/init.sh
 
 outputs:
     ip: