openstack/ironic
Code Issues Proposed changes

Fixes issue with checking whether ISO is passed

Browse Source 
This patch fixes the issue if IRONIC_BUILD_DEPLOY_RAMDISK
is set to false and IRONIC_DEPLOY_ISO is passed then it
will not throw the error.

Change-Id: Ic95f6e75d51db5cb60098bb131698cf44e772366
Story: 2007002
Task: 37777
This commit is contained in:
ankit
2019-12-09 07:44:21 +00:00
parent 8a0b1a39f2
commit 2d5a8cf967
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
devstack/lib/ironic
View File

@@ -293,7 +293,7 @@ IRONIC_DIB_DHCP_TIMEOUT=${IRONIC_DIB_DHCP_TIMEOUT:-60}
IRONIC_DEPLOY_ISO_REQUIRED=$(trueorfalse False IRONIC_DEPLOY_ISO_REQUIRED) IRONIC_DEPLOY_ISO_REQUIRED=$(trueorfalse False IRONIC_DEPLOY_ISO_REQUIRED)
if [[ "$IRONIC_DEPLOY_ISO_REQUIRED" = "True" \ if [[ "$IRONIC_DEPLOY_ISO_REQUIRED" = "True" \
&& "$IRONIC_BUILD_DEPLOY_RAMDISK" = "False" \ && "$IRONIC_BUILD_DEPLOY_RAMDISK" = "False" \
&& -n "$IRONIC_DEPLOY_ISO" ]]; then && ! -e "$IRONIC_DEPLOY_ISO" ]]; then
die "Prebuilt ISOs are not available, provide an ISO via IRONIC_DEPLOY_ISO \ die "Prebuilt ISOs are not available, provide an ISO via IRONIC_DEPLOY_ISO \
or set IRONIC_BUILD_DEPLOY_RAMDISK=True to use ISOs" or set IRONIC_BUILD_DEPLOY_RAMDISK=True to use ISOs"
fi fi