Merge "Allow streaming raw partition images"

This commit is contained in:
Zuul 2018-10-29 19:39:07 +00:00 committed by Gerrit Code Review
commit 7e47264ece
3 changed files with 8 additions and 3 deletions

View File

@ -1105,8 +1105,7 @@ def direct_deploy_should_convert_raw_image(node):
:returns: Boolean, whether the direct deploy interface should convert :returns: Boolean, whether the direct deploy interface should convert
image to raw. image to raw.
""" """
iwdi = node.driver_internal_info.get('is_whole_disk_image') return CONF.force_raw_images and CONF.agent.stream_raw_images
return CONF.force_raw_images and CONF.agent.stream_raw_images and iwdi
@image_cache.cleanup(priority=50) @image_cache.cleanup(priority=50)

View File

@ -1796,7 +1796,7 @@ class AgentMethodsTestCase(db_base.DbTestCase):
internal_info = self.node.driver_internal_info internal_info = self.node.driver_internal_info
internal_info['is_whole_disk_image'] = False internal_info['is_whole_disk_image'] = False
self.node.driver_internal_info = internal_info self.node.driver_internal_info = internal_info
self.assertFalse( self.assertTrue(
utils.direct_deploy_should_convert_raw_image(self.node)) utils.direct_deploy_should_convert_raw_image(self.node))

View File

@ -0,0 +1,6 @@
---
features:
- |
Allows streaming raw partition images to the ramdisk when using the
``direct`` deploy interface. Requires **ironic-python-agent** from
the Stein release series.