diff options
| author | Mark McLoughlin <markmc@redhat.com> | 2013-01-07 22:06:49 +0000 |
|---|---|---|
| committer | Mark McLoughlin <markmc@redhat.com> | 2013-01-08 10:23:40 +0000 |
| commit | 2bcca3959209707e5604948ceb70d039671ae002 (patch) | |
| tree | f1d3df4e8a24333251808c1fdd11f4865ba4273a /nova/notifications.py | |
| parent | 942b3ed874f045c892ad497ffadfdd80cb63bf9e (diff) | |
| download | nova-2bcca3959209707e5604948ceb70d039671ae002.tar.gz nova-2bcca3959209707e5604948ceb70d039671ae002.tar.xz nova-2bcca3959209707e5604948ceb70d039671ae002.zip | |
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
Diffstat (limited to 'nova/notifications.py')
| -rw-r--r-- | nova/notifications.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/notifications.py b/nova/notifications.py index 9f92e3dd4..f399ac55d 100644 --- a/nova/notifications.py +++ b/nova/notifications.py @@ -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', '') |