openstack/ironic
Code Issues Proposed changes

Bypassing upload deploy ramdisk/kernel to glance when deploy iso is given

Browse Source 
Deploy kernel and ramdisk are not required for deployment when deploy iso
is intended to be used for provisioning. This fix bypass uploading of
deploy ramdisk/kernel to glance when deploy iso is given.

Change-Id: I201b899abb1beb18454b6e2ac563c652201867a1
This commit is contained in:
kesper 2017-04-06 07:16:46 +00:00
parent 0711bf3448
commit 09b1fc673a
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
devstack/lib/ironic
View File

@ -1897,23 +1897,24 @@ function upload_baremetal_ironic_deploy {
fi fi
# load them into glance # load them into glance
IRONIC_DEPLOY_KERNEL_ID=$(openstack \ if ! is_deploy_iso_required; then
image create \ IRONIC_DEPLOY_KERNEL_ID=$(openstack \
$ironic_deploy_kernel_name \ image create \
--public --disk-format=aki \ $ironic_deploy_kernel_name \
--container-format=aki \ --public --disk-format=aki \
< $IRONIC_DEPLOY_KERNEL | grep ' id ' | get_field 2) --container-format=aki \
die_if_not_set $LINENO IRONIC_DEPLOY_KERNEL_ID "Failed to load kernel image into glance" < $IRONIC_DEPLOY_KERNEL | grep ' id ' | get_field 2)
die_if_not_set $LINENO IRONIC_DEPLOY_KERNEL_ID "Failed to load kernel image into glance"
IRONIC_DEPLOY_RAMDISK_ID=$(openstack \ IRONIC_DEPLOY_RAMDISK_ID=$(openstack \
image create \ image create \
$ironic_deploy_ramdisk_name \ $ironic_deploy_ramdisk_name \
--public --disk-format=ari \ --public --disk-format=ari \
--container-format=ari \ --container-format=ari \
< $IRONIC_DEPLOY_RAMDISK | grep ' id ' | get_field 2) < $IRONIC_DEPLOY_RAMDISK | grep ' id ' | get_field 2)
die_if_not_set $LINENO IRONIC_DEPLOY_RAMDISK_ID "Failed to load ramdisk image into glance" die_if_not_set $LINENO IRONIC_DEPLOY_RAMDISK_ID "Failed to load ramdisk image into glance"
if is_deploy_iso_required; then else
IRONIC_DEPLOY_ISO_ID=$(openstack \ IRONIC_DEPLOY_ISO_ID=$(openstack \
image create \ image create \
$(basename $IRONIC_DEPLOY_ISO) \ $(basename $IRONIC_DEPLOY_ISO) \