openstack/ironic-inspector
Code Issues Proposed changes

Revert "Block broken diskimage-builder versions to unblock the gate"

Browse Source 
This should land as soon as DIB 1.7.2 hits the gate.

This reverts commit 357bbcbb1f.

Change-Id: Id9560c67f2339eb6a812c5c28b428a68b4138a79
This commit is contained in:
Dmitry Tantsur 2016-01-19 13:08:14 +00:00
parent 357bbcbb1f
commit f7329d7563
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
devstack/plugin.sh
View File

@ -123,8 +123,9 @@ function prepare_tftp {
IRONIC_INSPECTOR_KERNEL_PATH="$IRONIC_INSPECTOR_IMAGE_PATH.kernel" 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" 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 [ ! -e "$IRONIC_INSPECTOR_KERNEL_PATH" -o ! -e "$IRONIC_INSPECTOR_INITRAMFS_PATH" ]; then
# FIXME: revert once 1.7.2 is out and hits the gate if [[ $(type -P ramdisk-image-create) == "" ]]; then
sudo pip install 'diskimage-builder!=1.6.0,!=1.7.0,!=1.7.1' pip_install diskimage_builder
fi
ramdisk-image-create $IRONIC_INSPECTOR_RAMDISK_FLAVOR \ ramdisk-image-create $IRONIC_INSPECTOR_RAMDISK_FLAVOR \
-o $IRONIC_INSPECTOR_IMAGE_PATH -o $IRONIC_INSPECTOR_IMAGE_PATH
fi fi