openstack/instack-undercloud
Code Issues Proposed changes

Ironic-discoverd: Add benchmark data

Browse Source 
This patch is adding support to run the AHC benhcmark as part of the
hardware detection in the ironic-discoverd ramdisk.

Two new binaries dependency were added:

  * fio: Used for storage benchmarking
  * sysbench: Used for memory and cpu benchmarking

The patch also removes the installation of the hardware library from
pip to install it from delorean. However, the hardware library has
an unpackaged dependency (ptyprocess). Until we get that packaged,
we will need to install from pip.

Change-Id: I94fe2ba71205fb996700b2c20af396f75900a04e
This commit is contained in:
Lucas Alvares Gomes 2015-03-05 15:03:53 +00:00 committed by John Trowbridge
parent cb7fc8731b
commit bb8a33c901
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
elements/ironic-discoverd-ramdisk-instack/binary-deps.d/discovery-ironic
View File

@ -50,3 +50,5 @@ uname
vgcreate
wc
lsblk
fio
sysbench

2
elements/ironic-discoverd-ramdisk-instack/init.d/80-discovery-ironic
View File

@ -162,7 +162,7 @@ log_n() {
}
run_edeploy_detect() {
hardware-detect > /hw.json || give_up "Failed to detect hardware"
hardware-detect --benchmark cpu disk mem > /hw.json || give_up "Failed to detect hardware"
}
run_standard_detect() {

9
elements/ironic-discoverd-ramdisk-instack/install.d/56-discovery-ironic-install-hardware
View File

@ -3,10 +3,9 @@
set -eu
set -o pipefail
install-packages hdparm ipmitool lshw ethtool lldpad hdparm sdparm pciutils mcelog smartmontools util-linux lvm2 jq
install-packages hdparm ipmitool lshw ethtool lldpad hdparm sdparm pciutils mcelog smartmontools util-linux lvm2 jq fio sysbench python-hardware
# python-hardware package is missing requires on python-psutil
# and also should have a requirement on python-ptyprocess which does not appear
# packaged anywhere, so we have to fall back to pip for now.
# We still need python-pip until we can get python-ptyprocess packaged
yum -y install python-pip
pip install hardware
pip install ptyprocess

4
scripts/instack-build-images
View File

@ -75,7 +75,7 @@ export DEPLOY_IMAGE_ELEMENT=${DEPLOY_IMAGE_ELEMENT:-deploy-ironic}
export DEPLOY_NAME=${DEPLOY_NAME:-deploy-ramdisk-ironic}
# Include delorean-rdo-management with the discovery ramdisk build so that we
# can install python-hardware from somewhere.
export DISCOVERY_IMAGE_ELEMENT=${DISCOVERY_IMAGE_ELEMENT:-"ironic-discoverd-ramdisk-instack"}
export DISCOVERY_IMAGE_ELEMENT=${DISCOVERY_IMAGE_ELEMENT:-"delorean-rdo-management ironic-discoverd-ramdisk-instack"}
export DISCOVERY_NAME=${DISCOVERY_NAME:-discovery-ramdisk}
export DIB_COMMON_ELEMENTS=${DIB_COMMON_ELEMENTS:-""}
@ -100,7 +100,7 @@ fi
export DELOREAN=${DELOREAN:-"0"}
if [ "$DELOREAN" = "1" ]; then
export DIB_COMMON_ELEMENTS="$DIB_COMMON_ELEMENTS delorean"
export DIB_COMMON_ELEMENTS="$DIB_COMMON_ELEMENTS delorean"
fi
export PACKAGES=${PACKAGES:-"1"}