From f25d2dde87547d9cc1d010851b3199f77ea56cf5 Mon Sep 17 00:00:00 2001 From: Dmitry Tantsur Date: Thu, 5 Feb 2015 07:40:13 -0500 Subject: [PATCH] Send boot_interface to discoverd --- .../init.d/80-discovery-ironic | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/elements/ironic-discoverd-ramdisk-instack/init.d/80-discovery-ironic b/elements/ironic-discoverd-ramdisk-instack/init.d/80-discovery-ironic index 7cfb3e18e..378ecee34 100644 --- a/elements/ironic-discoverd-ramdisk-instack/init.d/80-discovery-ironic +++ b/elements/ironic-discoverd-ramdisk-instack/init.d/80-discovery-ironic @@ -24,6 +24,7 @@ eval $(cat /proc/cmdline | tr ' ' "\n" | egrep "^EMBEDDED=") eval $(cat /proc/cmdline | tr ' ' "\n" | egrep "^IP=") eval $(cat /proc/cmdline | tr ' ' "\n" | egrep "^UPLOAD_LOG=") eval $(cat /proc/cmdline | tr ' ' "\n" | egrep "^discoverd_callback_url=") +eval $(cat /proc/cmdline | tr ' ' "\n" | egrep "^BOOTIF=") if [[ "$DEBUG" = "1" ]]; then log "DEBUG param deprecated, please use ONFAILURE=console" @@ -193,7 +194,7 @@ run_standard_detect() { 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="$NODE_DATA,\"interfaces\":$IFACES}" + NODE_DATA="$NODE_DATA,\"interfaces\":$IFACES,\"boot_interface\":\"$BOOTIF\"}" echo Collected $NODE_DATA echo "$NODE_DATA" > /standard.json