diff options
| author | Zuul <zuul@review.opendev.org> | 2022-03-11 17:31:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-03-11 17:31:19 +0000 |
| commit | 1d1cfbc1af8ae67613d085849508e31faf14a7d7 (patch) | |
| tree | f237bade9b0a55a15966f7e6f04d7a4766e8300c /ironic/common | |
| parent | 910448b8b331798701d103598541f96afb37fac0 (diff) | |
| parent | c62c16bd223a8da2262a3dadf1905ef3c2a7c88b (diff) | |
| download | ironic-1d1cfbc1af8ae67613d085849508e31faf14a7d7.tar.gz | |
Merge "Support img_type Glance property"
Diffstat (limited to 'ironic/common')
| -rw-r--r-- | ironic/common/images.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ironic/common/images.py b/ironic/common/images.py index 30eaed9e3..9f771ca29 100644 --- a/ironic/common/images.py +++ b/ironic/common/images.py @@ -607,6 +607,10 @@ def is_whole_disk_image(ctx, instance_info): except Exception: return + image_type = iproperties.get('img_type') + if image_type: + return image_type != IMAGE_TYPE_PARTITION + is_whole_disk_image = (not iproperties.get('kernel_id') and not iproperties.get('ramdisk_id')) else: |