From: Andrew Grimberg <agrimberg@linuxfoundation.org>
Date: Thu, 14 Dec 2017 22:58:27 +0000 (+0000)
Subject: Merge "Print the name of the stack being deleted"
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=281c30cfd0704a42eb19850ff04594e3312d1c8b;hp=d21034a42282a2cd7bfcf89f72fced2130d1c313;p=releng%2Fbuilder.git

Merge "Print the name of the stack being deleted"
---

diff --git a/openstack-hot/generic-server.yaml b/openstack-hot/generic-server.yaml
index dab55a34e..c3a5b359f 100644
--- 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