sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pass BOOTIF to ironic-discoverd from the ramdisk

Browse Source 
Required for smarter decision on which ports to create in Ironic.

Change-Id: Ib9f3b49ffdf19f1199a34351037fe65415fed816
This commit is contained in:
Dmitry Tantsur 2015-02-09 14:51:11 +01:00
parent 16b9bc7699
commit 4abf701484
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
elements/ironic-discoverd-ramdisk/init.d/80-ironic-discoverd-ramdisk
View File

@ -1,4 +1,6 @@
DISCOVERD_URL=$(get_kernel_parameter discoverd_callback_url) DISCOVERD_URL=$(get_kernel_parameter discoverd_callback_url)
BOOTIF=$(get_kernel_parameter BOOTIF)
if [ -z "$DISCOVERD_URL" ]; then if [ -z "$DISCOVERD_URL" ]; then
# Some old ramdisks are around # Some old ramdisks are around
DISCOVERD_URL=$(get_kernel_parameter ironic_callback_url) DISCOVERD_URL=$(get_kernel_parameter ironic_callback_url)
@ -61,7 +63,7 @@ disk_bytes=$(fdisk -l | grep Disk | awk '{print $5}' | head -n 1)
DISK_SIZE=$(($disk_bytes/1024/1024/1024 - 1)) DISK_SIZE=$(($disk_bytes/1024/1024/1024 - 1))
NODE_DATA="'{\"ipmi_address\":\"$BMC_ADDRESS\",\"local_gb\":$DISK_SIZE,\"memory_mb\":$RAM,\"cpus\":$CPUS,\"cpu_arch\":\"$CPU_ARCH\"" NODE_DATA="'{\"ipmi_address\":\"$BMC_ADDRESS\",\"local_gb\":$DISK_SIZE,\"memory_mb\":$RAM,\"cpus\":$CPUS,\"cpu_arch\":\"$CPU_ARCH\""
NODE_DATA="$NODE_DATA,\"interfaces\":$IFACES}'" NODE_DATA="$NODE_DATA,\"interfaces\":$IFACES,\"boot_interface\":\"$BOOTIF\"}'"
echo Collected $NODE_DATA echo Collected $NODE_DATA
NODE_RESP=$(request_curl POST $DISCOVERD_URL $NODE_DATA) NODE_RESP=$(request_curl POST $DISCOVERD_URL $NODE_DATA)