openstack
/
ironic-inspector
Code Issues Proposed changes

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

This commit is contained in:
Jenkins 2016-01-22 11:21:58 +00:00 committed by Gerrit Code Review
parent d7a7d69d5d f7329d7563
commit 7e868b6201
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_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
# 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'
if [[ $(type -P ramdisk-image-create) == "" ]]; then
pip_install diskimage_builder
fi
ramdisk-image-create $IRONIC_INSPECTOR_RAMDISK_FLAVOR \
-o $IRONIC_INSPECTOR_IMAGE_PATH
fi