From c926e1e36ff64718395699712ffb96d0f808e5e5 Mon Sep 17 00:00:00 2001 From: Dmitry Tantsur Date: Wed, 3 Feb 2016 12:47:23 +0100 Subject: [PATCH] [devstack] Use the coreos builder for the source build of the ramdisk The source builder in DIB has been broken for a while now, and anyway we have to use the CoreOS builder to create an IPA+inspector gate: I5631866edee42d5358f692e4fbcd82f1a6a1d4db. We can provide DIB as an option again as soon as it's fixed. Change-Id: I9a53c3bedd4106a4b03647209ea2a49efa4b2a47 --- devstack/plugin.sh | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/devstack/plugin.sh b/devstack/plugin.sh index e66706d85..a441adb71 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -98,25 +98,19 @@ function inspector_uses_ipa { function prepare_tftp { IRONIC_INSPECTOR_IMAGE_PATH="$TOP_DIR/files/ironic-inspector" + IRONIC_INSPECTOR_KERNEL_PATH="$IRONIC_INSPECTOR_IMAGE_PATH.kernel" IRONIC_INSPECTOR_INITRAMFS_PATH="$IRONIC_INSPECTOR_IMAGE_PATH.initramfs" IRONIC_INSPECTOR_CALLBACK_URI="$IRONIC_INSPECTOR_INTERNAL_URI/v1/continue" - if inspector_uses_ipa; then + if inspector_uses_ipa; then IRONIC_INSPECTOR_KERNEL_CMDLINE="ipa-inspection-callback-url=$IRONIC_INSPECTOR_CALLBACK_URI systemd.journald.forward_to_console=yes" IRONIC_INSPECTOR_KERNEL_CMDLINE="$IRONIC_INSPECTOR_KERNEL_CMDLINE ipa-inspection-collectors=$IRONIC_INSPECTOR_COLLECTORS" if [[ "$IRONIC_INSPECTOR_BUILD_RAMDISK" == "True" ]]; then - IRONIC_INSPECTOR_KERNEL_PATH="$IRONIC_INSPECTOR_IMAGE_PATH.vmlinuz" if [ ! -e "$IRONIC_INSPECTOR_KERNEL_PATH" -o ! -e "$IRONIC_INSPECTOR_INITRAMFS_PATH" ]; then - if [[ $(type -P disk-image-create) == "" ]]; then - pip_install_gr diskimage-builder - fi - disk-image-create $IRONIC_INSPECTOR_RAMDISK_FLAVOR \ - -o $IRONIC_INSPECTOR_IMAGE_PATH - sudo chown $STACK_USER $IRONIC_INSPECTOR_KERNEL_PATH + build_ipa_coreos_ramdisk "$IRONIC_INSPECTOR_KERNEL_PATH" "$IRONIC_INSPECTOR_INITRAMFS_PATH" fi else # download the agent image tarball - IRONIC_INSPECTOR_KERNEL_PATH="$IRONIC_INSPECTOR_IMAGE_PATH.kernel" if [ ! -e "$IRONIC_INSPECTOR_KERNEL_PATH" -o ! -e "$IRONIC_INSPECTOR_INITRAMFS_PATH" ]; then if [ -e "$IRONIC_DEPLOY_KERNEL_PATH" -a -e "$IRONIC_DEPLOY_RAMDISK_PATH" ]; then cp $IRONIC_DEPLOY_KERNEL_PATH $IRONIC_INSPECTOR_KERNEL_PATH @@ -128,7 +122,6 @@ function prepare_tftp { fi fi else - 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