Browse code

Add support for ephemeral disk to ironic

Add a new variable, IRONIC_VM_EPHEMERAL_DISK, to specify the size
of the ephemeral disk. Default will be zero to match the current
behavior.

Change-Id: Ia8a8ef364a85fc803b93fb936212de0894a19bd8

David Shrewsbury authored on 2014/05/02 00:38:21
Showing 1 changed files
... ...
@@ -59,6 +59,7 @@ IRONIC_VM_SPECS_CPU=${IRONIC_VM_SPECS_CPU:-1}
59 59
 #                 So placing 512 here to satisfy both.
60 60
 IRONIC_VM_SPECS_RAM=${IRONIC_VM_SPECS_RAM:-512}
61 61
 IRONIC_VM_SPECS_DISK=${IRONIC_VM_SPECS_DISK:-10}
62
+IRONIC_VM_EPHEMERAL_DISK=${IRONIC_VM_EPHEMERAL_DISK:-0}
62 63
 IRONIC_VM_EMULATOR=${IRONIC_VM_EMULATOR:-/usr/bin/qemu-system-x86_64}
63 64
 IRONIC_VM_NETWORK_BRIDGE=${IRONIC_VM_NETWORK_BRIDGE:-brbm}
64 65
 IRONIC_VM_NETWORK_RANGE=${IRONIC_VM_NETWORK_RANGE:-192.0.2.0/24}
... ...
@@ -355,7 +356,8 @@ function enroll_vms {
355 355
     done < $IRONIC_VM_MACS_CSV_FILE
356 356
 
357 357
     # create the nova flavor
358
-    nova flavor-create baremetal auto $IRONIC_VM_SPECS_RAM $IRONIC_VM_SPECS_DISK $IRONIC_VM_SPECS_CPU
358
+    adjusted_disk=$(($IRONIC_VM_SPECS_DISK - $IRONIC_VM_EPHEMERAL_DISK))
359
+    nova flavor-create --ephemeral $IRONIC_VM_EPHEMERAL_DISK baremetal auto $IRONIC_VM_SPECS_RAM $adjusted_disk $IRONIC_VM_SPECS_CPU
359 360
     nova flavor-key baremetal set "cpu_arch"="x86_64" "baremetal:deploy_kernel_id"="$IRONIC_DEPLOY_KERNEL_ID" "baremetal:deploy_ramdisk_id"="$IRONIC_DEPLOY_RAMDISK_ID"
360 361
 
361 362
     # intentional sleep to make sure the tag has been set to port