diff options
| author | Zuul <zuul@review.openstack.org> | 2018-09-07 14:56:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-09-07 14:56:07 +0000 |
| commit | 36e87dc5b472d79470b783fbba9ce396e3cbb96e (patch) | |
| tree | 44fe1ab516c05042c047151c742ad2fe020dd946 /ironic/drivers/modules/image_cache.py | |
| parent | 17c3de3413e11825de934f95ec66f69f7d06ae60 (diff) | |
| parent | bd82ead58080fa2b3e9e7b7fcb269a7a0fdc5a48 (diff) | |
| download | ironic-36e87dc5b472d79470b783fbba9ce396e3cbb96e.tar.gz | |
Merge "Direct deploy serve HTTP images from conductor"
Diffstat (limited to 'ironic/drivers/modules/image_cache.py')
| -rw-r--r-- | ironic/drivers/modules/image_cache.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ironic/drivers/modules/image_cache.py b/ironic/drivers/modules/image_cache.py index 3d96655ea..f4226c395 100644 --- a/ironic/drivers/modules/image_cache.py +++ b/ironic/drivers/modules/image_cache.py @@ -99,6 +99,11 @@ class ImageCache(object): href_encoded = href.encode('utf-8') if six.PY2 else href master_file_name = str(uuid.uuid5(uuid.NAMESPACE_URL, href_encoded)) + # NOTE(kaifeng) The ".converted" suffix acts as an indicator that the + # image cached has gone through the conversion logic. + if force_raw: + master_file_name = master_file_name + '.converted' + master_path = os.path.join(self.master_dir, master_file_name) if CONF.parallel_image_downloads: |