Browse code

Merge "Add support for ephemeral disk to ironic"

Jenkins authored on 2014/05/05 01:05:12
Showing 1 changed files
... ...
@@ -60,6 +60,7 @@ IRONIC_VM_SPECS_CPU=${IRONIC_VM_SPECS_CPU:-1}
60 60
 #               older and newer kernels.
61 61
 IRONIC_VM_SPECS_RAM=${IRONIC_VM_SPECS_RAM:-1024}
62 62
 IRONIC_VM_SPECS_DISK=${IRONIC_VM_SPECS_DISK:-10}
63
+IRONIC_VM_EPHEMERAL_DISK=${IRONIC_VM_EPHEMERAL_DISK:-0}
63 64
 IRONIC_VM_EMULATOR=${IRONIC_VM_EMULATOR:-/usr/bin/qemu-system-x86_64}
64 65
 IRONIC_VM_NETWORK_BRIDGE=${IRONIC_VM_NETWORK_BRIDGE:-brbm}
65 66
 IRONIC_VM_NETWORK_RANGE=${IRONIC_VM_NETWORK_RANGE:-192.0.2.0/24}
... ...
@@ -369,7 +370,8 @@ function enroll_vms {
369 369
     done < $IRONIC_VM_MACS_CSV_FILE
370 370
 
371 371
     # create the nova flavor
372
-    nova flavor-create baremetal auto $IRONIC_VM_SPECS_RAM $IRONIC_VM_SPECS_DISK $IRONIC_VM_SPECS_CPU
372
+    adjusted_disk=$(($IRONIC_VM_SPECS_DISK - $IRONIC_VM_EPHEMERAL_DISK))
373
+    nova flavor-create --ephemeral $IRONIC_VM_EPHEMERAL_DISK baremetal auto $IRONIC_VM_SPECS_RAM $adjusted_disk $IRONIC_VM_SPECS_CPU
373 374
     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"
374 375
 
375 376
     # intentional sleep to make sure the tag has been set to port