From 2bcca3959209707e5604948ceb70d039671ae002 Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Mon, 7 Jan 2013 22:06:49 +0000 Subject: Move global glance opts into nova.image.glance Move the glance_host, glance_port and glance_protocol options into the nova.image.glance module. Also move the generate_glance_url() and generate_image_url() utility methods there since they're the only uses of the options outside of the module. blueprint: scope-config-opts Change-Id: I3beca1a65cdd902a94ddc1c512d79a4de635ef38 --- nova/compute/manager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nova/compute') diff --git a/nova/compute/manager.py b/nova/compute/manager.py index b161f504c..03deb0b1d 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -1259,7 +1259,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, -- cgit