From b95c4c1f4a763ff632681e26f3b93b0db608b1fe Mon Sep 17 00:00:00 2001 From: Anton Arefiev Date: Mon, 16 Jan 2017 15:50:48 +0200 Subject: [PATCH] Devstack: don't rely on Ironic local vars Ironic kernel/ramdisk path variables are local, so checking whether kernel/ramdisk are downloaded by Ironic or not always fails. As result Inspector always forced to download inspection kernel/ramdisk even when it could use Ironic one. Depends-On: Idf5f61eb922480af2220d6e12c7668b0c756d813 Change-Id: Ie16595bef2bbee7b2ca29b2f4582b4a94a683315 --- devstack/plugin.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/devstack/plugin.sh b/devstack/plugin.sh index f96ebeb6a..0e3a0c4e8 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -107,9 +107,9 @@ function prepare_tftp { else # download the agent image tarball 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 - cp $IRONIC_DEPLOY_RAMDISK_PATH $IRONIC_INSPECTOR_INITRAMFS_PATH + if [ -e "$IRONIC_DEPLOY_KERNEL" -a -e "$IRONIC_DEPLOY_RAMDISK" ]; then + cp $IRONIC_DEPLOY_KERNEL $IRONIC_INSPECTOR_KERNEL_PATH + cp $IRONIC_DEPLOY_RAMDISK $IRONIC_INSPECTOR_INITRAMFS_PATH else wget "$IRONIC_AGENT_KERNEL_URL" -O $IRONIC_INSPECTOR_KERNEL_PATH wget "$IRONIC_AGENT_RAMDISK_URL" -O $IRONIC_INSPECTOR_INITRAMFS_PATH