Merge lp://qastaging/~rackspace-titan/nova/glance-client-keystone into lp://qastaging/~hudson-openstack/nova/trunk
Proposed by
Dan Prince
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Brian Waldon | ||||
| Approved revision: | 1548 | ||||
| Merged at revision: | 1556 | ||||
| Proposed branch: | lp://qastaging/~rackspace-titan/nova/glance-client-keystone | ||||
| Merge into: | lp://qastaging/~hudson-openstack/nova/trunk | ||||
| Diff against target: |
751 lines (+124/-168) 19 files modified
nova/api/auth.py (+1/-0) nova/api/openstack/create_instance_helper.py (+2/-1) nova/compute/api.py (+2/-1) nova/compute/manager.py (+2/-1) nova/context.py (+6/-3) nova/image/__init__.py (+3/-53) nova/image/glance.py (+68/-23) nova/tests/api/openstack/fakes.py (+1/-1) nova/tests/glance/stubs.py (+3/-3) nova/tests/integrated/integrated_helpers.py (+1/-1) nova/tests/test_xenapi.py (+2/-1) nova/virt/images.py (+2/-1) nova/virt/libvirt/connection.py (+2/-2) nova/virt/vmwareapi/fake.py (+3/-3) nova/virt/vmwareapi/vmops.py (+3/-1) nova/virt/vmwareapi/vmware_images.py (+9/-60) nova/virt/xenapi/vm_utils.py (+7/-10) nova/virt/xenapi/vmops.py (+2/-2) plugins/xenserver/xenapi/etc/xapi.d/plugins/glance (+5/-1) |
||||
| To merge this branch: | bzr merge lp://qastaging/~rackspace-titan/nova/glance-client-keystone | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Brian Waldon (community) | Approve | ||
| Vish Ishaya (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
Update GlanceClient, GlanceImageService, and Glance Xen plugin to work with Glance keystone.
To post a comment you must log in.
Revision history for this message
| Dan Prince (dan-prince) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
This seems very important to get in diablo as well. Can you create a backported version off of 1541?