Merge "Restore diskimage-builder install"

2016-06-24 17:50:47 +00:00 · 2016-06-24 17:50:47 +00:00 · 5c0aefd59d
commit 5c0aefd59d
parent 474251ef73 e84051e5b2
1 changed files with 6 additions and 0 deletions
--- a/devstack/lib/ironic
+++ b/devstack/lib/ironic
@ -1076,6 +1076,12 @@ function build_ipa_dib_ramdisk {
    local ramdisk_path=$2
    local tempdir
    tempdir=$(mktemp -d --tmpdir=${DEST})
+
+    # install diskimage-builder if not present
+    if ! $(type -P disk-image-create > /dev/null); then
+        install_diskimage_builder
+    fi
+
    echo "Building IPA ramdisk with DIB options: $IRONIC_DIB_RAMDISK_OPTIONS"
    disk-image-create "$IRONIC_DIB_RAMDISK_OPTIONS" \
                    -o  "$tempdir/ironic-agent" \