Merge "Allow import to specify image location ipxe=false"
This commit is contained in:
commit
458799f4aa
|
@ -1835,8 +1835,7 @@ def update_nodes_deploy_data(nodes,
|
||||||
"""Add specific kernel and ramdisk IDs to a node.
|
"""Add specific kernel and ramdisk IDs to a node.
|
||||||
|
|
||||||
Look at all images and update node data with the most specific
|
Look at all images and update node data with the most specific
|
||||||
deploy_kernel and deploy_ramdisk for the architecture/platform comination
|
deploy_kernel and deploy_ramdisk for the architecture/platform combination.
|
||||||
platform.
|
|
||||||
"""
|
"""
|
||||||
for node in nodes:
|
for node in nodes:
|
||||||
|
|
||||||
|
@ -1848,10 +1847,8 @@ def update_nodes_deploy_data(nodes,
|
||||||
for kernel in kernel_locations:
|
for kernel in kernel_locations:
|
||||||
path = os.path.join(http_boot, kernel)
|
path = os.path.join(http_boot, kernel)
|
||||||
if os.path.exists(path):
|
if os.path.exists(path):
|
||||||
# NOTE(dtantsur): we don't use http_boot here since we
|
|
||||||
# assume that the path in containers is fixed
|
|
||||||
node['kernel_id'] = 'file://%s/%s' % (
|
node['kernel_id'] = 'file://%s/%s' % (
|
||||||
constants.IRONIC_HTTP_BOOT_BIND_MOUNT,
|
http_boot,
|
||||||
kernel)
|
kernel)
|
||||||
break
|
break
|
||||||
else:
|
else:
|
||||||
|
@ -1867,7 +1864,7 @@ def update_nodes_deploy_data(nodes,
|
||||||
path = os.path.join(http_boot, ramdisk)
|
path = os.path.join(http_boot, ramdisk)
|
||||||
if os.path.exists(path):
|
if os.path.exists(path):
|
||||||
node['ramdisk_id'] = 'file://%s/%s' % (
|
node['ramdisk_id'] = 'file://%s/%s' % (
|
||||||
constants.IRONIC_HTTP_BOOT_BIND_MOUNT,
|
http_boot,
|
||||||
ramdisk)
|
ramdisk)
|
||||||
break
|
break
|
||||||
else:
|
else:
|
||||||
|
|
Loading…
Reference in New Issue