Merge lp:~rconradharris/glance/bug720459 into lp:~glance-coresec/glance/cactus-trunk
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Jay Pipes | ||||
Approved revision: | 76 | ||||
Merged at revision: | 74 | ||||
Proposed branch: | lp:~rconradharris/glance/bug720459 | ||||
Merge into: | lp:~glance-coresec/glance/cactus-trunk | ||||
Diff against target: |
12 lines (+1/-1) 1 file modified
glance/registry/db/models.py (+1/-1) |
||||
To merge this branch: | bzr merge lp:~rconradharris/glance/bug720459 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jay Pipes (community) | Approve | ||
Devin Carlen (community) | Approve | ||
Review via email: mp+50098@code.launchpad.net |
Description of the change
Removes image type validation in the Glance registry.
Nova xs-unified-images requires adding a new image type 'vhd' along side of 'machine', 'raw', etc. Since image_type isn't used by Glance itself (it merely stores the value and hands it back to Nova), Glance shouldn't be the arbiter of what values are acceptable-- Nova should. This promotes loose-coupling and ensures that Glance won't have to change in lock-step with Nova.
More to the point, this a stop-gap to make Glance work with the new xs-unified-images branch until we get proper `container_format` and `disk_format` modeling in Glance. When that happens, we may end up ditching `image_type` altogether.
this will break a variety of tests in bug704854. Is it possible to remove this image_type when we do the disk_format changes? Is there a reason this patch has to hit before that blueprint is completed?