diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-01-09 03:27:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-01-09 03:27:42 +0000 |
| commit | bdd90e4ceabccf66163ca77f4cdbd965345b7002 (patch) | |
| tree | c7abcaa41ffbc19f9ae4f2959fc056c95e547412 /nova/compute | |
| parent | 9026553e2f6af93fa8a15dbb9dd452f73d09ac1d (diff) | |
| parent | 2bcca3959209707e5604948ceb70d039671ae002 (diff) | |
Merge "Move global glance opts into nova.image.glance"
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/manager.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index e9a2fa743..f542fedf2 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -1326,7 +1326,7 @@ class ComputeManager(manager.SchedulerDependentManager): # This instance.exists message should contain the original # image_ref, not the new one. Since the DB has been updated # to point to the new one... we have to override it. - orig_image_ref_url = utils.generate_image_url(orig_image_ref) + orig_image_ref_url = glance.generate_image_url(orig_image_ref) extra_usage_info = {'image_ref_url': orig_image_ref_url} compute_utils.notify_usage_exists(context, instance, current_period=True, system_metadata=orig_sys_metadata, |