Merge "Change default RPM repo, CentOS CBS to ODL Nexus"

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

diff --git a/openstack-hot/generic-server.yaml b/openstack-hot/generic-server.yaml
index 46614ffde887bb0573be09a92edd87b40742c75c..dab55a34e1fc3a2c6c9fb24dc5ec1b73517c57b9 100644 (file)
--- a/openstack-hot/generic-server.yaml
+++ b/openstack-hot/generic-server.yaml
@@ -26,7 +26,7 @@ parameters:
         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
@@ -37,7 +37,10 @@ resources:
         type: "OS::Nova::Server"
         properties:
             flavor: {get_param: vm_flavor}
-            image: {get_param: vm_image}
+            block_device_mapping_v2:
+                - image: {get_param: vm_image}
+                  delete_on_termination: true
+                  volume_size: 40
             name:
                 str_replace:
                     template: SILO-JOB_NAME-GROUP-VM_TYPE-INDEX
@@ -48,11 +51,11 @@ resources:
                             str_split:
                                 - ' - '
                                 - {get_param: vm_image}
-                                - 1
+                                - 2
                         "GROUP": {get_param: group}
                         "INDEX": {get_param: index}
             networks:
-                - network: RC-ODL
+                - network: odlci
             key_name: {get_param: ssh_key}
             user_data: |
                 #!/bin/bash
@@ -66,4 +69,4 @@ resources:
 outputs:
     ip:
         description: IP address of the instance
-        value: {get_attr: [instance, networks, RC-ODL, 0]}
+        value: {get_attr: [instance, networks, odlci, 0]}