openstack/nova
Code Issues Proposed changes

Move global glance opts into nova.image.glance

Browse Source 
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
This commit is contained in:
Mark McLoughlin
2013-01-07 22:06:49 +00:00
parent 942b3ed874
commit 2bcca39592
11 changed files with 69 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
nova/notifications.py
View File

@@ -22,6 +22,7 @@ the system.
import nova.context
from nova import db
from nova import exception
from nova.image import glance
from nova import network
from nova.network import model as network_model
from nova.openstack.common import cfg
@@ -277,7 +278,7 @@ def info_from_instance(context, instance_ref, network_info,
def null_safe_str(s):
return str(s) if s else ''
image_ref_url = utils.generate_image_url(instance_ref['image_ref'])
image_ref_url = glance.generate_image_url(instance_ref['image_ref'])
instance_type_name = instance_ref.get('instance_type', {}).get('name', '')