From 357bbcbb1f471cbeca5e9d8ba6d9731591f1290b Mon Sep 17 00:00:00 2001 From: Dmitry Tantsur Date: Tue, 19 Jan 2016 11:49:28 +0100 Subject: [PATCH] Block broken diskimage-builder versions to unblock the gate Revert as soon as DIB 1.7.2 is released. Change-Id: I02d7ff2c1c126787a0d91ac0cfa70871ee8014c6 --- devstack/plugin.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 606af5b7c..460b7a199 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -123,9 +123,8 @@ function prepare_tftp { IRONIC_INSPECTOR_KERNEL_PATH="$IRONIC_INSPECTOR_IMAGE_PATH.kernel" IRONIC_INSPECTOR_KERNEL_CMDLINE="discoverd_callback_url=$IRONIC_INSPECTOR_CALLBACK_URI inspector_callback_url=$IRONIC_INSPECTOR_CALLBACK_URI" if [ ! -e "$IRONIC_INSPECTOR_KERNEL_PATH" -o ! -e "$IRONIC_INSPECTOR_INITRAMFS_PATH" ]; then - if [[ $(type -P ramdisk-image-create) == "" ]]; then - pip_install diskimage_builder - fi + # FIXME: revert once 1.7.2 is out and hits the gate + sudo pip install 'diskimage-builder!=1.6.0,!=1.7.0,!=1.7.1' ramdisk-image-create $IRONIC_INSPECTOR_RAMDISK_FLAVOR \ -o $IRONIC_INSPECTOR_IMAGE_PATH fi