From 3e4612b2f7185a4cf4ca21ac8e4dce302a774373 Mon Sep 17 00:00:00 2001 From: David Shrewsbury Date: Thu, 1 May 2014 11:38:21 -0400 Subject: [PATCH] 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 --- lib/ironic | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/ironic b/lib/ironic index 757b83e4be..90d9b93be8 100644 --- a/lib/ironic +++ b/lib/ironic @@ -59,6 +59,7 @@ IRONIC_VM_SPECS_CPU=${IRONIC_VM_SPECS_CPU:-1} # So placing 512 here to satisfy both. IRONIC_VM_SPECS_RAM=${IRONIC_VM_SPECS_RAM:-512} IRONIC_VM_SPECS_DISK=${IRONIC_VM_SPECS_DISK:-10} +IRONIC_VM_EPHEMERAL_DISK=${IRONIC_VM_EPHEMERAL_DISK:-0} IRONIC_VM_EMULATOR=${IRONIC_VM_EMULATOR:-/usr/bin/qemu-system-x86_64} IRONIC_VM_NETWORK_BRIDGE=${IRONIC_VM_NETWORK_BRIDGE:-brbm} IRONIC_VM_NETWORK_RANGE=${IRONIC_VM_NETWORK_RANGE:-192.0.2.0/24} @@ -355,7 +356,8 @@ function enroll_vms { done < $IRONIC_VM_MACS_CSV_FILE # create the nova flavor - nova flavor-create baremetal auto $IRONIC_VM_SPECS_RAM $IRONIC_VM_SPECS_DISK $IRONIC_VM_SPECS_CPU + adjusted_disk=$(($IRONIC_VM_SPECS_DISK - $IRONIC_VM_EPHEMERAL_DISK)) + nova flavor-create --ephemeral $IRONIC_VM_EPHEMERAL_DISK baremetal auto $IRONIC_VM_SPECS_RAM $adjusted_disk $IRONIC_VM_SPECS_CPU 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" # intentional sleep to make sure the tag has been set to port