openstack/ironic-inspector
Code Issues Proposed changes

Devstack: don't rely on Ironic local vars

Browse Source 
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
This commit is contained in:
Anton Arefiev 2017-01-16 15:50:48 +02:00
parent e8dcb40921
commit b95c4c1f4a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
devstack/plugin.sh
View File

@ -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