Merge "Allow import to specify image location ipxe=false"

tripleoclient/utils.py

@@ -1835,8 +1835,7 @@ def update_nodes_deploy_data(nodes,
     """Add specific kernel and ramdisk IDs to a node.
 
     Look at all images and update node data with the most specific
-    deploy_kernel and deploy_ramdisk for the architecture/platform comination
-    platform.
+    deploy_kernel and deploy_ramdisk for the architecture/platform combination.
     """
     for node in nodes:
 
@@ -1848,10 +1847,8 @@ def update_nodes_deploy_data(nodes,
             for kernel in kernel_locations:
                 path = os.path.join(http_boot, kernel)
                 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' % (
-                        constants.IRONIC_HTTP_BOOT_BIND_MOUNT,
+                        http_boot,
                         kernel)
                     break
             else:
@@ -1867,7 +1864,7 @@ def update_nodes_deploy_data(nodes,
                 path = os.path.join(http_boot, ramdisk)
                 if os.path.exists(path):
                     node['ramdisk_id'] = 'file://%s/%s' % (
-                        constants.IRONIC_HTTP_BOOT_BIND_MOUNT,
+                        http_boot,
                         ramdisk)
                     break
             else: