openstack/diskimage-builder
Code Issues Proposed changes

Merge "Fix memory detection in ironic-discoverd-ramdisk"

Browse Source
This commit is contained in:
Jenkins 2015-02-23 12:27:09 +00:00 committed by Gerrit Code Review
commit 409f8ff131
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,9 +43,11 @@ update ".ipmi_address = \"$BMC_ADDRESS\""
CPU_ARCH=$(lscpu | grep Architecture | awk '{ print $2 }')
update ".cpu_arch = \"$CPU_ARCH\""
# NOTE(lucasagomes): dmidecode because we want to know the total
# memory in the system, even the reserved part to the BIOS
RAM=$(dmidecode -t 16 | grep 'Maximum Capacity' | awk '{if ($4 == "GB") s+=$3*1024; else s+=$3;} END {print s}')
RAM=0
for i in $(dmidecode --type memory | grep Size | awk '{ print $2; }' | grep -E '[0-9]+');
do
RAM=$(( RAM + $i ));
done
update ".memory_mb = $RAM"
CPUS=$(cat /proc/cpuinfo | grep processor | wc -l)